onny/verwaltungstracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect max tag length

Browse source
This commit is contained in:
Stefan Wehrmeyer 2022-03-15 14:46:37 +01:00
parent 0bfceca2e7
commit 0750b28c7b
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
froide_govplan/models.py
View file

@ -17,6 +17,7 @@ from taggit.models import TaggedItemBase
from froide.foirequest.models import FoiRequest from froide.foirequest.models import FoiRequest
from froide.follow.models import Follower from froide.follow.models import Follower
from froide.helper.forms import TAG_NAME_MAX_CHARS
from froide.organization.models import Organization from froide.organization.models import Organization
from froide.publicbody.models import Category, Jurisdiction, PublicBody from froide.publicbody.models import Category, Jurisdiction, PublicBody
@ -248,18 +249,23 @@ class GovernmentPlan(models.Model):
def get_recent_foirequest(self): def get_recent_foirequest(self):
return self.get_related_foirequests()[0] return self.get_related_foirequests()[0]
def get_plan_tag(self):
plan_tag = "{}{}".format(PLAN_TAG_PREFIX, self.slug)
return plan_tag[:TAG_NAME_MAX_CHARS]
def get_related_foirequests(self): def get_related_foirequests(self):
if not self.responsible_publicbody: if not self.responsible_publicbody:
return [] return []
if hasattr(self, "_related_foirequests"): if hasattr(self, "_related_foirequests"):
return self._related_foirequests return self._related_foirequests
self._related_foirequests = ( self._related_foirequests = (
FoiRequest.objects.filter( FoiRequest.objects.filter(
visibility=FoiRequest.VISIBILITY.VISIBLE_TO_PUBLIC, visibility=FoiRequest.VISIBILITY.VISIBLE_TO_PUBLIC,
public_body=self.responsible_publicbody, public_body=self.responsible_publicbody,
) )
.filter(tags__name=TAG_NAME) .filter(tags__name=TAG_NAME)
.filter(tags__name="{}{}".format(PLAN_TAG_PREFIX, self.slug)) .filter(tags__name=self.get_plan_tag())
.order_by("-first_message") .order_by("-first_message")
) )
return self._related_foirequests return self._related_foirequests

2
froide_govplan/utils.py
View file

@ -19,7 +19,7 @@ def make_request_url(plan, publicbody):
query = { query = {
"subject": subject.encode("utf-8"), "subject": subject.encode("utf-8"),
"body": body, "body": body,
"tags": "{},{}{}".format(TAG_NAME, PLAN_TAG_PREFIX, plan.slug), "tags": "{},{}{}".format(TAG_NAME, plan.get_plan_tag()),
} }
hide_features = ["hide_public", "hide_similar", "hide_draft"] hide_features = ["hide_public", "hide_similar", "hide_draft"]