mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add page number

master
Bob Mottram 2019-09-06 17:37:33 +01:00
parent 8997b77277
commit 0f1b6c4367
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webinterface.py
View File

@ -1374,15 +1374,18 @@ def followerApprovalActive(baseDir: str,nickname: str,domain: str) -> bool:
manuallyApprovesFollowers=actorJson['manuallyApprovesFollowers'] manuallyApprovesFollowers=actorJson['manuallyApprovesFollowers']
return manuallyApprovesFollowers return manuallyApprovesFollowers
def insertQuestion(nickname: str,content: str,postJsonObject: {}) -> str: def insertQuestion(nickname: str,content: str,postJsonObject: {},pageNumber: int) -> str:
""" Inserts question selection into a post """ Inserts question selection into a post
""" """
if not isQuestion(postJsonObject): if not isQuestion(postJsonObject):
return content return content
if len(postJsonObject['object']['oneOf'])==0: if len(postJsonObject['object']['oneOf'])==0:
return content return content
pageNumberStr=''
if pageNumber:
pageNumberStr='?page='+str(pageNumber)
content+='<div class="question">' content+='<div class="question">'
content+='<form method="POST" action="/users/'+nickname+'/question">' content+='<form method="POST" action="/users/'+nickname+'/question'+pageNumberStr+'">'
content+='<input type="hidden" name="messageId" value="'+postJsonObject['id']+'">' content+='<input type="hidden" name="messageId" value="'+postJsonObject['id']+'">'
for choice in postJsonObject['object']['oneOf']: for choice in postJsonObject['object']['oneOf']:
if not choice.get('type'): if not choice.get('type'):
@ -1725,7 +1728,7 @@ def individualPostAsHtml(pageNumber: int,baseDir: str, \
if not postJsonObject['object']['sensitive']: if not postJsonObject['object']['sensitive']:
contentStr=postJsonObject['object']['content']+attachmentStr contentStr=postJsonObject['object']['content']+attachmentStr
contentStr=addEmbeddedElements(contentStr) contentStr=addEmbeddedElements(contentStr)
contentStr=insertQuestion(nickname,contentStr,postJsonObject) contentStr=insertQuestion(nickname,contentStr,postJsonObject,pageNumber)
else: else:
postID='post'+str(createPassword(8)) postID='post'+str(createPassword(8))
contentStr='' contentStr=''