Skip to content

Commit 1fe7090

Browse files
committed
Cleaning up frontend URL-s from hashtag+appends
1 parent 09b9bd2 commit 1fe7090

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
@@ -178,7 +178,7 @@ def get_resource_uri(self, record, rtype):
178178
belonging_event = (
179179
record.event.id if record.event is not None else 57
180180
) # Very rare – giving a non-existent | manually created surge – no event
181-
resource_uri = "%s/emergencies/%s#surge" % (settings.FRONTEND_URL, belonging_event)
181+
resource_uri = "%s/emergencies/%s" % (settings.FRONTEND_URL, belonging_event)
182182
elif rtype == RecordType.SURGE_DEPLOYMENT_MESSAGES:
183183
resource_uri = "%s/%s" % (settings.FRONTEND_URL, "deployments") # can be further sophisticated
184184
elif rtype == RecordType.APPEAL and (record.event is not None and not record.needs_confirmation):
@@ -333,7 +333,7 @@ def get_weekly_digest_latest_deployments(self):
333333
# 'type': 'Alert',
334334
# 'operation': alert.operation,
335335
# 'event_url': (
336-
# '{}/emergencies/{}#overview'.format(settings.FRONTEND_URL, event.id) if event else
336+
# '{}/emergencies/{}'.format(settings.FRONTEND_URL, event.id) if event else
337337
# settings.FRONTEND_URL,
338338
# ),
339339
# 'society_from': '',
@@ -352,9 +352,7 @@ def get_weekly_digest_latest_deployments(self):
352352
country_from = Country.objects.get(id=pers.country_from_id) if pers.country_from_id is not None else None
353353
dep_to_add = {
354354
"operation": event.name if event else "",
355-
"event_url": (
356-
"{}/emergencies/{}#overview".format(settings.FRONTEND_URL, event.id) if event else settings.FRONTEND_URL
357-
),
355+
"event_url": ("{}/emergencies/{}".format(settings.FRONTEND_URL, event.id) if event else settings.FRONTEND_URL),
358356
"society_from": country_from.society_name if country_from else "",
359357
"name": pers.name,
360358
"role": pers.role,
@@ -597,9 +595,7 @@ def construct_template_record(self, rtype, record):
597595
delegates += int(f.num_expats_delegates or 0)
598596
resource_uri, follow_url = self.get_resource_uri(record, rtype), None
599597
if resource_uri != settings.FRONTEND_URL:
600-
# instead of '{}/account#notifications'.format(settings.FRONTEND_URL):
601598
follow_url = resource_uri + "/follow"
602-
resource_uri += "#overview"
603599
rec_obj = {
604600
"frontend_url": settings.FRONTEND_URL,
605601
"resource_uri": resource_uri,

0 commit comments

Comments
 (0)