Skip to content

Commit e7929ff

Browse files
JoaoJesus94iamareebjamal
authored andcommitted
fix: event sort by name to actually sort by name (#3552)
1 parent 45018cf commit e7929ff

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

app/controllers/admin/events/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1313
return [
1414
{
1515
name : 'Name',
16-
valuePath : 'id',
16+
valuePath : 'name',
1717
extraValuePaths : ['logoUrl', 'identifier', 'deletedAt', 'name'],
1818
isSortable : true,
1919
headerComponent : 'tables/headers/sort',

app/controllers/events/list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
99
return [
1010
{
1111
name : 'Name',
12-
valuePath : 'identifier',
12+
valuePath : 'name',
1313
width : 150,
1414
isSortable : true,
15-
extraValuePaths : ['name', 'logoUrl'],
15+
extraValuePaths : ['identifier', 'logoUrl'],
1616
headerComponent : 'tables/headers/sort',
1717
cellComponent : 'ui-table/cell/cell-event-general',
1818
options : {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div class="ui header weight-400">
2-
<img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{extraRecords.name}}
2+
<img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{record}}
33
</div>
44
<div class="ui horizontal large basic buttons">
5-
{{#ui-popup tagName='a' click=(action props.actions.moveToDetails record) content=(t 'Event Dashboard') class='ui icon button' position='top center'}}
5+
{{#ui-popup tagName='a' click=(action props.actions.moveToDetails extraRecords.identifier) content=(t 'Event Dashboard') class='ui icon button' position='top center'}}
66
<i class="tasks icon"></i>
77
{{/ui-popup}}
8-
{{#ui-popup tagName='a' click=(action props.actions.moveToPublic record) content=(t 'View') class='ui icon button' position='top center'}}
8+
{{#ui-popup tagName='a' click=(action props.actions.moveToPublic extraRecords.identifier) content=(t 'View') class='ui icon button' position='top center'}}
99
<i class="unhide icon"></i>
1010
{{/ui-popup}}
11-
{{#ui-popup content=(t 'Edit') click=(action props.actions.editEvent record) class='ui icon button' position='top center'}}
11+
{{#ui-popup content=(t 'Edit') click=(action props.actions.editEvent extraRecords.identifier) class='ui icon button' position='top center'}}
1212
<i class="edit icon"></i>
1313
{{/ui-popup}}
1414
</div>

app/templates/components/ui-table/cell/cell-event.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="ui header weight-400">
2-
<img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{extraRecords.name}}
2+
<img src="{{if extraRecords.logoUrl extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{record}}
33
</div>
44

55
<div class="ui horizontal compact basic buttons">
@@ -10,11 +10,11 @@
1010
<i class="edit icon"></i>
1111
{{/ui-popup}}
1212
{{#if (and props.options.hasRestorePrivileges extraRecords.deletedAt)}}
13-
{{#ui-popup content=(t 'Restore') click=(action props.actions.restoreEvent record) class='ui icon button' position='left center'}}
13+
{{#ui-popup content=(t 'Restore') click=(action props.actions.restoreEvent extraRecords.identifier) class='ui icon button' position='left center'}}
1414
<i class="undo icon"></i>
1515
{{/ui-popup}}
1616
{{else}}
17-
{{#ui-popup content=(t 'Delete') click=(action props.actions.openDeleteEventModal extraRecords.identifier extraRecords.name) class='ui icon button' position='left center'}}
17+
{{#ui-popup content=(t 'Delete') click=(action props.actions.openDeleteEventModal extraRecords.identifier record) class='ui icon button' position='left center'}}
1818
<i class="trash outline icon"></i>
1919
{{/ui-popup}}
2020
{{/if}}

tests/integration/components/ui-table/cell/cell-event-general-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { render } from '@ember/test-helpers';
66
module('Integration | Component | ui table/cell/cell event general', function(hooks) {
77
setupIntegrationTest(hooks);
88

9-
const extraRecords = { name: 'Event', logoUrl: 'url' };
10-
const record = 'abc215f';
9+
const extraRecords = { identifier: 'abc215f', logoUrl: 'url' };
10+
const record = 'Event';
1111

1212
const props = {
1313
actions: {

0 commit comments

Comments
 (0)