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

Previous button on shared items search

merge-requests/30/head
Bob Mottram 2021-07-27 10:57:52 +01:00
parent ec3b083543
commit af4bff1f72
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
webapp_search.py
View File

@ -169,6 +169,33 @@ def _htmlSearchResultShare(sharedItem: {}, translate: {},
return sharedItemsForm return sharedItemsForm
def _htmlSearchResultSharePrev(actor: str, domainFull: str,
callingDomain: str, pageNumber: int,
searchStrLower: str, translate: {}) -> str:
"""Returns the html for the previous button on shared items search results
"""
postActor = getAltPath(actor, domainFull, callingDomain)
# previous page link, needs to be a POST
sharedItemsForm = \
'<form method="POST" action="' + postActor + '/searchhandle?page=' + \
str(pageNumber - 1) + '">\n'
sharedItemsForm += \
' <input type="hidden" ' + 'name="actor" value="' + actor + '">\n'
sharedItemsForm += \
' <input type="hidden" ' + 'name="searchtext" value="' + \
searchStrLower + '"><br>\n'
sharedItemsForm += \
' <center>\n' + ' <a href="' + actor + \
'" type="submit" name="submitSearch">\n'
sharedItemsForm += \
' <img loading="lazy" ' + 'class="pageicon" src="/icons' + \
'/pageup.png" title="' + translate['Page up'] + \
'" alt="' + translate['Page up'] + '"/></a>\n'
sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>\n'
return sharedItemsForm
def htmlSearchSharedItems(cssCache: {}, translate: {}, def htmlSearchSharedItems(cssCache: {}, translate: {},
baseDir: str, searchStr: str, baseDir: str, searchStr: str,
pageNumber: int, pageNumber: int,
@ -215,41 +242,20 @@ def htmlSearchSharedItems(cssCache: {}, translate: {},
for name, sharedItem in sharesJson.items(): for name, sharedItem in sharesJson.items():
if _matchSharedItem(searchStrLowerList, sharedItem): if _matchSharedItem(searchStrLowerList, sharedItem):
if currPage == pageNumber: if currPage == pageNumber:
# show individual search result
sharedItemsForm += \ sharedItemsForm += \
_htmlSearchResultShare(sharedItem, translate, _htmlSearchResultShare(sharedItem, translate,
httpPrefix, domainFull, httpPrefix, domainFull,
contactNickname, contactNickname,
name, actor) name, actor)
if not resultsExist and currPage > 1: if not resultsExist and currPage > 1:
postActor = \ # show the previous button
getAltPath(actor, domainFull,
callingDomain)
# previous page link, needs to be a POST
sharedItemsForm += \ sharedItemsForm += \
'<form method="POST" action="' + \ _htmlSearchResultSharePrev(actor, domainFull,
postActor + \ callingDomain,
'/searchhandle?page=' + \ pageNumber,
str(pageNumber - 1) + '">\n' searchStrLower,
sharedItemsForm += \ translate)
' <input type="hidden" ' + \
'name="actor" value="' + actor + '">\n'
sharedItemsForm += \
' <input type="hidden" ' + \
'name="searchtext" value="' + \
searchStrLower + '"><br>\n'
sharedItemsForm += \
' <center>\n' + \
' <a href="' + actor + \
'" type="submit" name="submitSearch">\n'
sharedItemsForm += \
' <img loading="lazy" ' + \
'class="pageicon" src="/icons' + \
'/pageup.png" title="' + \
translate['Page up'] + \
'" alt="' + translate['Page up'] + \
'"/></a>\n'
sharedItemsForm += ' </center>\n'
sharedItemsForm += '</form>\n'
resultsExist = True resultsExist = True
ctr += 1 ctr += 1
if ctr >= resultsPerPage: if ctr >= resultsPerPage: