diff --git a/app/mixins/ember-table-route.js b/app/mixins/ember-table-route.js index ecaf8de82c9..6ae69c88766 100644 --- a/app/mixins/ember-table-route.js +++ b/app/mixins/ember-table-route.js @@ -19,6 +19,7 @@ export default Mixin.create({ refreshModel: true } }, + per_page: 10, applySearchFilters(options, params, searchFields) { if (!Array.isArray(searchFields)) { diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js index dd406ca3df5..5337c76614e 100644 --- a/app/routes/events/view/tickets/attendees/list.js +++ b/app/routes/events/view/tickets/attendees/list.js @@ -71,7 +71,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { let queryString = { include : 'user,order', filter : filterOptions, - 'page[size]' : params.per_page || 10, + 'page[size]' : params.per_page, 'page[number]' : params.page || 1 }; diff --git a/app/styles/partials/utils.scss b/app/styles/partials/utils.scss index e017160f0e2..9fb38e138d1 100644 --- a/app/styles/partials/utils.scss +++ b/app/styles/partials/utils.scss @@ -246,6 +246,10 @@ padding: 1rem !important; } +.z-index-0 { + z-index: 0 !important; +} + .mt-0 { margin-top: 0 !important; } diff --git a/app/templates/components/tables/default.hbs b/app/templates/components/tables/default.hbs index eaa3d1eec7b..b15cabbfcdb 100644 --- a/app/templates/components/tables/default.hbs +++ b/app/templates/components/tables/default.hbs @@ -14,7 +14,7 @@ {{/unless}} -
+
{{t 'Show'}} -
{{this.pageSize}}
+
{{if (eq this.pageSize 0) 'All' this.pageSize}}