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

Share description in new post

merge-requests/8/head
Bob Mottram 2020-12-07 10:39:45 +00:00
parent 4fe227f5a0
commit 31365514ea
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon.py
View File

@ -1856,7 +1856,7 @@ class PubServer(BaseHTTPRequestHandler):
baseDir,
httpPrefix,
reportPath, None,
[optionsActor], None,
[optionsActor], None, None,
pageNumber,
chooserNickname,
domain,
@ -1925,7 +1925,7 @@ class PubServer(BaseHTTPRequestHandler):
baseDir,
httpPrefix,
reportPath, None, [],
postUrl, pageNumber,
None, postUrl, pageNumber,
chooserNickname,
domain,
domainFull,
@ -8961,7 +8961,7 @@ class PubServer(BaseHTTPRequestHandler):
httpPrefix,
path, inReplyToUrl,
replyToList,
shareDescription,
shareDescription, None,
replyPageNumber,
nickname, domain,
domainFull,

13
webapp_create_post.py
View File

@ -167,6 +167,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
baseDir: str, httpPrefix: str,
path: str, inReplyTo: str,
mentions: [],
shareDescription: str,
reportUrl: str, pageNumber: int,
nickname: str, domain: str,
domainFull: str,
@ -612,7 +613,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
dropdownReportSuffix += '?mention=' + mentionedActor
dropDownContent = ''
if not reportUrl:
if not reportUrl and not shareDescription:
dropDownContent = \
htmlNewPostDropDown(scopeIcon, scopeDescription,
replyStr,
@ -630,7 +631,9 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
dropdownEventSuffix,
dropdownReportSuffix)
else:
mentionsStr = 'Re: ' + reportUrl + '\n\n' + mentionsStr
if not shareDescription:
# reporting a post to moderator
mentionsStr = 'Re: ' + reportUrl + '\n\n' + mentionsStr
newPostForm += \
'<form enctype="multipart/form-data" method="POST" ' + \
@ -678,7 +681,11 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
newPostForm += \
' <label class="labels">' + placeholderSubject + '</label><br>'
newPostForm += ' <input type="text" name="subject">'
if not shareDescription:
shareDescription = ''
newPostForm += \
' <input type="text" name="subject" value="' + \
shareDescription + '">'
newPostForm += ''
selectedStr = ' selected'