Skip to content

Commit 666f17b

Browse files
committed
Cleaning up frontend URL-s from hashtag+appends
1 parent c7ea4c9 commit 666f17b

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

api/management/commands/index_and_notify.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def get_resource_uri(self, record, rtype):
179179
belonging_event = (
180180
record.event.id if record.event is not None else 57
181181
) # Very rare – giving a non-existent | manually created surge – no event
182-
resource_uri = "%s/emergencies/%s#surge" % (settings.FRONTEND_URL, belonging_event)
182+
resource_uri = "%s/emergencies/%s" % (settings.FRONTEND_URL, belonging_event)
183183
elif rtype == RecordType.SURGE_DEPLOYMENT_MESSAGES:
184184
resource_uri = "%s/%s" % (settings.FRONTEND_URL, "deployments") # can be further sophisticated
185185
elif rtype == RecordType.APPEAL and (record.event is not None and not record.needs_confirmation):
@@ -334,7 +334,7 @@ def get_weekly_digest_latest_deployments(self):
334334
# 'type': 'Alert',
335335
# 'operation': alert.operation,
336336
# 'event_url': (
337-
# '{}/emergencies/{}#overview'.format(settings.FRONTEND_URL, event.id) if event else
337+
# '{}/emergencies/{}'.format(settings.FRONTEND_URL, event.id) if event else
338338
# settings.FRONTEND_URL,
339339
# ),
340340
# 'society_from': '',
@@ -353,9 +353,7 @@ def get_weekly_digest_latest_deployments(self):
353353
country_from = Country.objects.get(id=pers.country_from_id) if pers.country_from_id is not None else None
354354
dep_to_add = {
355355
"operation": event.name if event else "",
356-
"event_url": (
357-
"{}/emergencies/{}#overview".format(settings.FRONTEND_URL, event.id) if event else settings.FRONTEND_URL
358-
),
356+
"event_url": ("{}/emergencies/{}".format(settings.FRONTEND_URL, event.id) if event else settings.FRONTEND_URL),
359357
"society_from": country_from.society_name if country_from else "",
360358
"name": pers.name,
361359
"role": pers.role,
@@ -598,9 +596,7 @@ def construct_template_record(self, rtype, record):
598596
delegates += int(f.num_expats_delegates or 0)
599597
resource_uri, follow_url = self.get_resource_uri(record, rtype), None
600598
if resource_uri != settings.FRONTEND_URL:
601-
# instead of '{}/account#notifications'.format(settings.FRONTEND_URL):
602599
follow_url = resource_uri + "/follow"
603-
resource_uri += "#overview"
604600
rec_obj = {
605601
"frontend_url": settings.FRONTEND_URL,
606602
"resource_uri": resource_uri,

0 commit comments

Comments
 (0)