mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 07:20:12 +01:00
Bug fixes and buttons for previous and next page
* Use buttons for next and previous page in search results * Add custom routine for stringifying and parsing the selector to JSON so RegExp objects are preserved
This commit is contained in:
parent
4e8fc46475
commit
78a1d08a17
6 changed files with 74 additions and 15 deletions
|
|
@ -37,12 +37,16 @@ template(name="globalSearch")
|
|||
a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}")
|
||||
each card in results.get
|
||||
+resultCard(card)
|
||||
if hasPreviousPage.get
|
||||
button.js-previous-page
|
||||
| {{_ 'previous-page' }}
|
||||
if hasNextPage.get
|
||||
button.js-next-page
|
||||
| {{_ 'next-page' }}
|
||||
table.global-search-footer
|
||||
tr
|
||||
td.global-search-previous-page
|
||||
if hasPreviousPage.get
|
||||
button.js-previous-page
|
||||
| {{_ 'previous-page' }}
|
||||
td.global-search-next-page(align="right")
|
||||
if hasNextPage.get
|
||||
button.js-next-page
|
||||
| {{_ 'next-page' }}
|
||||
else
|
||||
.global-search-instructions
|
||||
h2 {{_ 'boards' }}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ BlazeComponent.extendComponent({
|
|||
if (this.queryParams) {
|
||||
const sessionData = this.getSessionData();
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('selector:', JSON.parse(sessionData.selector));
|
||||
console.log('selector:', sessionData.getSelector());
|
||||
// console.log('session data:', sessionData);
|
||||
const cards = Cards.find({ _id: { $in: sessionData.cards } });
|
||||
this.queryErrors = sessionData.errors;
|
||||
|
|
@ -414,7 +414,7 @@ BlazeComponent.extendComponent({
|
|||
|
||||
const params = {
|
||||
limit: this.resultsPerPage,
|
||||
selector: JSON.parse(sessionData.selector),
|
||||
selector: sessionData.getSelector(),
|
||||
skip: sessionData.lastHit,
|
||||
};
|
||||
|
||||
|
|
@ -441,7 +441,7 @@ BlazeComponent.extendComponent({
|
|||
|
||||
const params = {
|
||||
limit: this.resultsPerPage,
|
||||
selector: JSON.parse(sessionData.selector),
|
||||
selector: sessionData.getSelector(),
|
||||
skip:
|
||||
sessionData.lastHit - sessionData.resultsCount - this.resultsPerPage,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -104,3 +104,15 @@ code
|
|||
|
||||
.list-title
|
||||
background-color: darkgray
|
||||
|
||||
.global-search-footer
|
||||
border: none
|
||||
width: 100%
|
||||
|
||||
.global-search-next-page
|
||||
border: none
|
||||
text-align: right;
|
||||
|
||||
.global-search-previous-page
|
||||
border: none
|
||||
text-align: left;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue