Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions app/controllers/events/list.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import Controller from '@ember/controller';
import { computed, action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {

export default class extends Controller {
queryParams = ['page', 'per_page'];
page = 1;
per_page = 10;
search = null;
sort_dir = null;
sort_by = null;
sorts = [];
@computed()
get columns() {
return [
Expand Down
11 changes: 11 additions & 0 deletions app/mixins/ember-table-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Mixin from '@ember/object/mixin';

export default Mixin.create({
queryParams : ['page', 'per_page', 'search', 'sort_dir', 'sort_by'],
page : 1,
per_page : 10,
search : null,
sort_dir : null,
sort_by : null,
sorts : []
});
File renamed without changes.
4 changes: 2 additions & 2 deletions app/routes/events/list.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import moment from 'moment';
import EmberTableMixin from 'open-event-frontend/mixins/ember-table';
export default class extends Route.extend(EmberTableMixin) {
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
export default class extends Route.extend(EmberTableRouteMixin) {

titleToken() {
switch (this.get('params.event_state')) {
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/mixins/ember-table-controller-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import EmberObject from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';
import { module, test } from 'qunit';

module('Unit | Mixin | ember-table-controller', function() {
// Replace this with your real tests.
test('it works', function(assert) {
let EmberTableControllerObject = EmberObject.extend(EmberTableControllerMixin);
let subject = EmberTableControllerObject.create();
assert.ok(subject);
});
});
12 changes: 12 additions & 0 deletions tests/unit/mixins/ember-table-route-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import EmberObject from '@ember/object';
import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route';
import { module, test } from 'qunit';

module('Unit | Mixin | ember-table-route', function() {
// Replace this with your real tests.
test('it works', function(assert) {
let EmberTableRouteObject = EmberObject.extend(EmberTableRouteMixin);
let subject = EmberTableRouteObject.create();
assert.ok(subject);
});
});
12 changes: 0 additions & 12 deletions tests/unit/mixins/ember-table-test.js

This file was deleted.