indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Back button goes to moderation screen

merge-requests/30/head
Bob Mottram 2020-12-20 13:54:54 +00:00
parent 3a0644a2ae
commit 42531e476f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -5091,6 +5091,7 @@ class PubServer(BaseHTTPRequestHandler):
optionsProfileUrl = optionsProfileUrl.replace('.' + ext, '') optionsProfileUrl = optionsProfileUrl.replace('.' + ext, '')
optionsProfileUrl = \ optionsProfileUrl = \
'/users/' + optionsProfileUrl + '/avatar.' + ext '/users/' + optionsProfileUrl + '/avatar.' + ext
backToPath = 'moderation'
if optionsPageNumber.isdigit(): if optionsPageNumber.isdigit():
pageNumber = int(optionsPageNumber) pageNumber = int(optionsPageNumber)
optionsLink = None optionsLink = None
@ -5136,7 +5137,8 @@ class PubServer(BaseHTTPRequestHandler):
toxAddress, jamiAddress, toxAddress, jamiAddress,
PGPpubKey, PGPfingerprint, PGPpubKey, PGPfingerprint,
emailAddress, emailAddress,
self.server.dormantMonths).encode('utf-8') self.server.dormantMonths,
backToPath).encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)
self._write(msg) self._write(msg)

5
webapp_person_options.py
View File

@ -43,7 +43,8 @@ def htmlPersonOptions(defaultTimeline: str,
PGPpubKey: str, PGPpubKey: str,
PGPfingerprint: str, PGPfingerprint: str,
emailAddress: str, emailAddress: str,
dormantMonths: int) -> str: dormantMonths: int,
backToPath: str) -> str:
"""Show options for a person: view/follow/block/report """Show options for a person: view/follow/block/report
""" """
optionsDomain, optionsPort = getDomainFromActor(optionsActor) optionsDomain, optionsPort = getDomainFromActor(optionsActor)
@ -225,6 +226,8 @@ def htmlPersonOptions(defaultTimeline: str,
backPath = '/' backPath = '/'
if nickname: if nickname:
backPath = '/users/' + nickname + '/' + defaultTimeline backPath = '/users/' + nickname + '/' + defaultTimeline
if 'moderation' in backToPath:
backPath = '/users/' + nickname + '/moderation'
optionsStr += \ optionsStr += \
' <a href="' + backPath + '"><button type="button" ' + \ ' <a href="' + backPath + '"><button type="button" ' + \
'class="buttonIcon" name="submitBack">' + translate['Go Back'] + \ 'class="buttonIcon" name="submitBack">' + translate['Go Back'] + \