Merge pull request #400 from datamade/description_to_title

change bill listing description and description to title
datamade · Jan 16, 2024 · efb5e65 · efb5e65
2 parents 7982316 + 496097d
commit efb5e65
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/chicago/models.py b/chicago/models.py
@@ -75,10 +75,6 @@ def inferred_status(self):
         else:
             return "Active"
 
-    @property
-    def listing_description(self):
-        return self.title
-
     @property
     def topics(self):
         tags = topic_classifier(self.title)

diff --git a/chicago/templates/divided_votes.html b/chicago/templates/divided_votes.html
@@ -33,7 +33,7 @@ <h1>Divided Votes - {{ legislative_session.name }}</h1>
               <tr>
                 <td>
                   <p class='h4'><a href="{% url 'bill_detail' legislation.slug %}">{{ legislation.friendly_name }}</a> {{ legislation.inferred_status | inferred_status_label | safe }}</p>
-                  {{ legislation.listing_description | short_blurb }}
+                  {{ legislation.title | short_blurb }}
 
                   {% if legislation.topics %}
                     <br />

diff --git a/chicago/templates/feeds/person_detail_item_description.html b/chicago/templates/feeds/person_detail_item_description.html
@@ -14,7 +14,7 @@
 </style>
 
 <body>
-  {{ obj.description }}
+  {{ obj.title }}
   <p>
 
     Sponsors:

diff --git a/chicago/templates/legislation.html b/chicago/templates/legislation.html
@@ -274,7 +274,7 @@ <h3>Legislation not found</h3>
       "name": "{{ legislation.friendly_name }}",
       "alternateName": ["{{ legislation.identifier }}", "{{ legislation.identifier.split|join:'' }}"],
       {% if legislation.actions %}"datePublished": "{{legislation.actions.0.date|date:'Y-m-d'}}", {% endif %}
-      "description": "{{ legislation.description }}",
+      "description": "{{ legislation.title }}",
       "text": "{% firstof legislation.full_text legislation.ocr_full_text %}"
     }
   </script>

diff --git a/chicago/templates/partials/legislation_item.html b/chicago/templates/partials/legislation_item.html
@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-xs-10">
     <p>
-      {{ legislation.listing_description | short_blurb }}
+      {{ legislation.title | short_blurb }}
     </p>
   </div>
   <div class='col-xs-1'>

diff --git a/chicago/templates/partials/search_result.html b/chicago/templates/partials/search_result.html
@@ -9,11 +9,11 @@
   <div class="col-xs-11">
     {% if query %}
       <p class="search-result">
-        {% highlight r.object.listing_description with query %}
+        {% highlight r.object.title with query %}
       </p>
     {% else %}
       <p>
-        {{ r.object.listing_description | short_blurb }}
+        {{ r.object.title | short_blurb }}
       </p>
     {% endif %}
   </div>

diff --git a/chicago/views.py b/chicago/views.py
@@ -301,7 +301,7 @@ def get_context_data(self, **kwargs):
 
         seo = {}
         seo.update(settings.SITE_META)
-        seo["site_desc"] = bill.listing_description
+        seo["site_desc"] = bill.title
         seo["title"] = "%s - %s" % (bill.friendly_name, settings.SITE_META["site_name"])
         context["seo"] = seo