From 11dae3f471df285e6842048bbe17cd074ab8b722 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Wed, 6 Nov 2019 03:53:24 +0530 Subject: [PATCH 1/3] Correcting the routes for my-session --- app/controllers/my-sessions/view.js | 52 ++++++++++++++++------------- app/templates/my-sessions/view.hbs | 4 +-- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/controllers/my-sessions/view.js b/app/controllers/my-sessions/view.js index 2d6b24793d7..8567d6cb42b 100644 --- a/app/controllers/my-sessions/view.js +++ b/app/controllers/my-sessions/view.js @@ -1,34 +1,38 @@ import Controller from '@ember/controller'; -import { computed } from '@ember/object'; +import { computed, action } from '@ember/object'; import moment from 'moment'; -export default Controller.extend({ - isUpcoming: computed('model.endsAt', function() { +export default class extends Controller { + + @computed('model.endsAt') + get isUpcoming() { let endAt = this.get('model.endsAt'); if (endAt < moment()) { return false; } return true; - }), + } - actions: { - openProposalDeleteModal() { - this.set('isProposalDeleteModalOpen', true); - }, - deleteProposal() { - this.set('isLoading', true); - this.model.destroyRecord() - .then(() => { - this.transitionToRoute('my-sessions.index'); - this.notify.success(this.l10n.t('Proposal has been deleted successfully.')); - }) - .catch(() => { - this.notify.error(this.l10n.t('An unexpected error has occurred.')); - }) - .finally(() => { - this.set('isLoading', false); - this.set('isProposalDeleteModalOpen', false); - }); - } + @action + openProposalDeleteModal() { + this.set('isProposalDeleteModalOpen', true); } -}); + + @action + deleteProposal() { + this.set('isLoading', true); + this.model.destroyRecord() + .then(() => { + this.transitionToRoute('my-sessions.index'); + this.notify.success(this.l10n.t('Proposal has been deleted successfully.')); + }) + .catch(() => { + this.notify.error(this.l10n.t('An unexpected error has occurred.')); + }) + .finally(() => { + this.set('isLoading', false); + this.set('isProposalDeleteModalOpen', false); + }); + } +} + diff --git a/app/templates/my-sessions/view.hbs b/app/templates/my-sessions/view.hbs index 45f72181e16..d90d9e9b068 100644 --- a/app/templates/my-sessions/view.hbs +++ b/app/templates/my-sessions/view.hbs @@ -1,7 +1,7 @@
{{#if (not model.isLocked)}} - {{#link-to 'events.view.sessions.edit' model.event.id model.id}} + {{#link-to 'public.cfs.edit-session' model.event.id model.id}} {{#if device.isMobile}} @@ -10,7 +10,7 @@ {{/if}} {{#each model.speakers as |speaker|}} {{#if (eq speaker.email authManager.currentUser.email)}} - {{#link-to 'events.view.speakers.edit' model.event.id speaker.id}} + {{#link-to 'public.cfs.edit-speaker' model.event.id speaker.id}} {{#if device.isMobile}} From dbe378e960575832fdd15827b0cb4807d15dc7e3 Mon Sep 17 00:00:00 2001 From: kushthedude Date: Sun, 10 Nov 2019 16:55:09 +0530 Subject: [PATCH 2/3] Reverting ES6 migration --- app/controllers/my-sessions/view.js | 52 +++++++++++++---------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/app/controllers/my-sessions/view.js b/app/controllers/my-sessions/view.js index 8567d6cb42b..dc9c60b9852 100644 --- a/app/controllers/my-sessions/view.js +++ b/app/controllers/my-sessions/view.js @@ -1,38 +1,34 @@ import Controller from '@ember/controller'; -import { computed, action } from '@ember/object'; +import { computed } from '@ember/object'; import moment from 'moment'; -export default class extends Controller { - - @computed('model.endsAt') - get isUpcoming() { +export default Controller.extend({ + isUpcoming: computed('model.endsAt', function() { let endAt = this.get('model.endsAt'); if (endAt < moment()) { return false; } return true; - } - - @action - openProposalDeleteModal() { - this.set('isProposalDeleteModalOpen', true); - } + }), - @action - deleteProposal() { - this.set('isLoading', true); - this.model.destroyRecord() - .then(() => { - this.transitionToRoute('my-sessions.index'); - this.notify.success(this.l10n.t('Proposal has been deleted successfully.')); - }) - .catch(() => { - this.notify.error(this.l10n.t('An unexpected error has occurred.')); - }) - .finally(() => { - this.set('isLoading', false); - this.set('isProposalDeleteModalOpen', false); - }); + actions: { + openProposalDeleteModal() { + this.set('isProposalDeleteModalOpen', true); + }, + deleteProposal() { + this.set('isLoading', true); + this.model.destroyRecord() + .then(() => { + this.transitionToRoute('my-sessions.index'); + this.notify.success(this.l10n.t('Proposal has been deleted successfully.')); + }) + .catch(() => { + this.notify.error(this.l10n.t('An unexpected error has occurred.')); + }) + .finally(() => { + this.set('isLoading', false); + this.set('isProposalDeleteModalOpen', false); + }); + } } -} - +}); \ No newline at end of file From 6ac18adcc4862b23c9b350b475fe989acad62f45 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Sun, 10 Nov 2019 17:23:19 +0530 Subject: [PATCH 3/3] Update app/controllers/my-sessions/view.js Co-Authored-By: Areeb Jamal --- app/controllers/my-sessions/view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/my-sessions/view.js b/app/controllers/my-sessions/view.js index dc9c60b9852..2d6b24793d7 100644 --- a/app/controllers/my-sessions/view.js +++ b/app/controllers/my-sessions/view.js @@ -31,4 +31,4 @@ export default Controller.extend({ }); } } -}); \ No newline at end of file +});