fix: event sort by name to actually sort by name (#3552)

fossasia · Dec 5, 2019 · e7929ff · e7929ff
1 parent 45018cf
commit e7929ff
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/app/controllers/admin/events/list.js b/app/controllers/admin/events/list.js
@@ -13,7 +13,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
      return [
        {
          name            : 'Name',
-         valuePath       : 'id',
+         valuePath       : 'name',
          extraValuePaths : ['logoUrl', 'identifier', 'deletedAt', 'name'],
          isSortable      : true,
          headerComponent : 'tables/headers/sort',

diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js
@@ -9,10 +9,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
     return [
       {
         name            : 'Name',
-        valuePath       : 'identifier',
+        valuePath       : 'name',
         width           : 150,
         isSortable      : true,
-        extraValuePaths : ['name', 'logoUrl'],
+        extraValuePaths : ['identifier', 'logoUrl'],
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/cell-event-general',
         options         : {

diff --git a/app/templates/components/ui-table/cell/cell-event-general.hbs b/app/templates/components/ui-table/cell/cell-event-general.hbs
@@ -1,14 +1,14 @@
 <div class="ui header weight-400">
-  <img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{extraRecords.name}}
+  <img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{record}}
 </div>
 <div class="ui horizontal large basic buttons">
-  {{#ui-popup tagName='a' click=(action props.actions.moveToDetails record) content=(t 'Event Dashboard') class='ui icon button' position='top center'}}
+  {{#ui-popup tagName='a' click=(action props.actions.moveToDetails extraRecords.identifier) content=(t 'Event Dashboard') class='ui icon button' position='top center'}}
     <i class="tasks icon"></i>
   {{/ui-popup}}
-  {{#ui-popup tagName='a' click=(action props.actions.moveToPublic record) content=(t 'View') class='ui icon button' position='top center'}}
+  {{#ui-popup tagName='a' click=(action props.actions.moveToPublic extraRecords.identifier) content=(t 'View') class='ui icon button' position='top center'}}
     <i class="unhide icon"></i>
   {{/ui-popup}}
-  {{#ui-popup content=(t 'Edit') click=(action props.actions.editEvent record) class='ui icon button' position='top center'}}
+  {{#ui-popup content=(t 'Edit') click=(action props.actions.editEvent extraRecords.identifier) class='ui icon button' position='top center'}}
     <i class="edit icon"></i>
   {{/ui-popup}}
 </div>
diff --git a/app/templates/components/ui-table/cell/cell-event.hbs b/app/templates/components/ui-table/cell/cell-event.hbs
@@ -1,5 +1,5 @@
 <div class="ui header weight-400">
-  <img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{extraRecords.name}}
+  <img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{record}}
 </div>
 
 <div class="ui horizontal compact basic buttons">
@@ -10,11 +10,11 @@
     <i class="edit icon"></i>
   {{/ui-popup}}
   {{#if (and props.options.hasRestorePrivileges extraRecords.deletedAt)}}
-    {{#ui-popup content=(t 'Restore') click=(action props.actions.restoreEvent record) class='ui icon button' position='left center'}}
+    {{#ui-popup content=(t 'Restore') click=(action props.actions.restoreEvent extraRecords.identifier) class='ui icon button' position='left center'}}
       <i class="undo icon"></i>
     {{/ui-popup}}
   {{else}}
-    {{#ui-popup content=(t 'Delete') click=(action props.actions.openDeleteEventModal extraRecords.identifier extraRecords.name) class='ui icon button' position='left center'}}
+    {{#ui-popup content=(t 'Delete') click=(action props.actions.openDeleteEventModal extraRecords.identifier record) class='ui icon button' position='left center'}}
       <i class="trash outline icon"></i>
     {{/ui-popup}}
   {{/if}}

diff --git a/tests/integration/components/ui-table/cell/cell-event-general-test.js b/tests/integration/components/ui-table/cell/cell-event-general-test.js
@@ -6,8 +6,8 @@ import { render } from '@ember/test-helpers';
 module('Integration | Component | ui table/cell/cell event general', function(hooks) {
   setupIntegrationTest(hooks);
 
-  const extraRecords = { name: 'Event', logoUrl: 'url' };
-  const record = 'abc215f';
+  const extraRecords = { identifier: 'abc215f', logoUrl: 'url' };
+  const record = 'Event';
 
   const props = {
     actions: {