text updates

hawc/apps/animal/forms.py

@@ -453,9 +453,9 @@ def helper(self):
         if vocab_enabled:
             vocab_id = self.instance.assessment.vocabulary
             vocab_url = VocabularyNamespace(vocab_id).display_url
-            vocab = f"""&nbsp;The <a href="{vocab_url}">{VocabularyNamespace(vocab_id).display_name}</a> is enabled for this assessment. Browse to view controlled terms, and whenever possible please use these terms."""
+            vocab = f"""The <a href="{vocab_url}">{VocabularyNamespace(vocab_id).display_name}</a> is enabled for this assessment. Browse to view controlled terms, and whenever possible please use these terms."""
         else:
-            vocab = f"""&nbsp;A controlled vocabulary is not enabled for this assessment. However, you can still browse the <a href="{reverse('vocab:ehv-browse')}">EHV</a> to see if this vocabulary would be a good fit for your assessment."""
+            vocab = f"""A controlled vocabulary is not enabled for this assessment. However, you can still browse the <a href="{reverse('vocab:ehv-browse')}">EHV</a> to see if this vocabulary would be a good fit for your assessment."""
 
         if self.instance.id:
             inputs = {
@@ -466,7 +466,7 @@ def helper(self):
         else:
             inputs = {
                 "legend_text": "Create new endpoint",
-                "help_text": f"""Create a new endpoint. An endpoint should describe one measure-of-effect in the study. It may or may not contain quantitative data.{vocab}""",
+                "help_text": f"""Create a new endpoint. An endpoint should describe one measure-of-effect in the study. It may or may not contain quantitative data. {vocab}""",
                 "cancel_url": self.instance.animal_group.get_absolute_url(),
             }
 

hawc/apps/assessment/models.py

@@ -366,15 +366,8 @@ def user_is_project_manager_or_higher(self, user) -> bool:
         perms = self.get_permissions()
         return perms.project_manager_or_higher(user)
 
-    def get_vocabulary_display(self) -> str:
-        # override default method
-        if self.vocabulary:
-            return VocabularyNamespace(self.vocabulary).display_name
-        else:
-            return ""
-
-    def get_vocabulary_url(self) -> str | None:
-        return VocabularyNamespace(self.vocabulary).display_url if self.vocabulary else None
+    def get_vocabulary_display(self) -> str | None:
+        return VocabularyNamespace(self.vocabulary).display_name if self.vocabulary else None
 
     def get_noel_names(self) -> NoelNames:
         if self.noel_name == constants.NoelName.NEL: