From 496097d4a065346a8a52bf569927b09e70a1ceb4 Mon Sep 17 00:00:00 2001 From: Forest Gregg Date: Fri, 12 Jan 2024 21:26:02 -0500 Subject: [PATCH] change bill listing description and description to title --- chicago/models.py | 4 ---- chicago/templates/divided_votes.html | 2 +- chicago/templates/feeds/person_detail_item_description.html | 2 +- chicago/templates/legislation.html | 2 +- chicago/templates/partials/legislation_item.html | 2 +- chicago/templates/partials/search_result.html | 4 ++-- chicago/views.py | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/chicago/models.py b/chicago/models.py index 1618d03..48b0550 100644 --- 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 index e07d91b..9b2f632 100644 --- a/chicago/templates/divided_votes.html +++ b/chicago/templates/divided_votes.html @@ -33,7 +33,7 @@

Divided Votes - {{ legislative_session.name }}

{{ legislation.friendly_name }} {{ legislation.inferred_status | inferred_status_label | safe }}

- {{ legislation.listing_description | short_blurb }} + {{ legislation.title | short_blurb }} {% if legislation.topics %}
diff --git a/chicago/templates/feeds/person_detail_item_description.html b/chicago/templates/feeds/person_detail_item_description.html index 9551e0b..333606b 100644 --- a/chicago/templates/feeds/person_detail_item_description.html +++ b/chicago/templates/feeds/person_detail_item_description.html @@ -14,7 +14,7 @@ - {{ obj.description }} + {{ obj.title }}

Sponsors: diff --git a/chicago/templates/legislation.html b/chicago/templates/legislation.html index 7debeb7..67b6cc8 100644 --- a/chicago/templates/legislation.html +++ b/chicago/templates/legislation.html @@ -274,7 +274,7 @@

Legislation not found

"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 %}" } diff --git a/chicago/templates/partials/legislation_item.html b/chicago/templates/partials/legislation_item.html index fb7b2b8..52470f0 100644 --- a/chicago/templates/partials/legislation_item.html +++ b/chicago/templates/partials/legislation_item.html @@ -8,7 +8,7 @@

- {{ legislation.listing_description | short_blurb }} + {{ legislation.title | short_blurb }}

diff --git a/chicago/templates/partials/search_result.html b/chicago/templates/partials/search_result.html index 3ebbe1f..beb5ba9 100644 --- a/chicago/templates/partials/search_result.html +++ b/chicago/templates/partials/search_result.html @@ -9,11 +9,11 @@
{% if query %}

- {% highlight r.object.listing_description with query %} + {% highlight r.object.title with query %}

{% else %}

- {{ r.object.listing_description | short_blurb }} + {{ r.object.title | short_blurb }}

{% endif %}
diff --git a/chicago/views.py b/chicago/views.py index e4d86a0..72bc04a 100644 --- 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