tqt/Ghost-Admin
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost-Admin.git synced 2023-12-14 02:33:04 +01:00
Code Issues Releases Wiki Activity

Fixed sending of empty search param in members browse requests

Browse source 
no issue

- when the search param was empty we were still adding a `?search=` query param to the API request
This commit is contained in:
Kevin Ansfield 2020-05-28 11:07:51 +01:00
parent 4e4d7cc85c
commit cae4a0163a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/routes/members.js
View file

@ -25,7 +25,9 @@ export default class MembersRoute extends AuthenticatedRoute {
}
model(params) {
if (!params.searchParam) {
const {label, searchParam} = params;
if (!searchParam) {
this.controllerFor('members').resetSearch();
}
@ -33,9 +35,9 @@ export default class MembersRoute extends AuthenticatedRoute {
let startDate = new Date();
// bypass the stale data shortcut if params change
let forceReload = params.label !== this._lastLabel || params.searchParam !== this._lastSearchParam;
this._lastLabel = params.label;
this._lastSearchParam = params.searchParam;
let forceReload = label !== this._lastLabel || searchParam !== this._lastSearchParam;
this._lastLabel = label;
this._lastSearchParam = searchParam;
// unless we have a forced reload, do not re-fetch the members list unless it's more than a minute old
// keeps navigation between list->details->list snappy
@ -46,15 +48,15 @@ export default class MembersRoute extends AuthenticatedRoute {
this._startDate = startDate;
return this.ellaSparse.array((range = {}, query = {}) => {
const labelFilter = params.label ? `label:'${params.label}'+` : '';
const labelFilter = label ? `label:'${label}'+` : '';
const searchQuery = searchParam ? {search: searchParam} : {};
query = Object.assign({
limit: range.length,
page: range.start / range.length,
order: 'created_at desc',
filter: `${labelFilter}created_at:<='${moment.utc(this._startDate).format('YYYY-MM-DD HH:mm:ss')}'`,
search: params.searchParam
}, query);
filter: `${labelFilter}created_at:<='${moment.utc(this._startDate).format('YYYY-MM-DD HH:mm:ss')}'`
}, searchQuery, query);
return this.store.query('member', query).then((result) => {
return {