fix-9076: Cannot show all entries when selecting "Show All" in View A…

…ttendees page (#9078) * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page --------- Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
fossasia · Aug 21, 2023 · 8ef23c3 · 8ef23c3
1 parent 2ba0fe3
commit 8ef23c3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -14,7 +14,7 @@
  </div>
  {{/unless}}
  </div>
- <div class="ui no bottom padding row">
+ <div class="ui no bottom padding row z-index-0">
  <EmberTable @tableColor={{@color}} as |t|>
  <t.head
  @sortFunction={{null}}

diff --git a/app/templates/components/tables/utilities/page-size-input.hbs b/app/templates/components/tables/utilities/page-size-input.hbs
@@ -1,7 +1,7 @@
 <span>
  {{t 'Show'}}
  <UiDropdown @class="inline" @onChange={{action (mut this.pageSize)}} @forceSelection={{true}}>
- <div class="default text">{{this.pageSize}}</div>
+ <div class="default text">{{if (eq this.pageSize 0) 'All' this.pageSize}}</div>
  <i class="dropdown icon"></i>
  <div class="menu">
  {{#each this.sizes as |size|}}