Skip to content

Commit e42a665

Browse files
authored
enh: move Delete button to settings page (#4029)
1 parent a8aac00 commit e42a665

File tree

4 files changed

+41
-38
lines changed

4 files changed

+41
-38
lines changed

app/controllers/events/view.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ import { isEmpty } from '@ember/utils';
33
import { action } from '@ember/object';
44

55
export default class extends Controller {
6-
@action
7-
openDeleteEventModal() {
8-
this.set('isEventDeleteModalOpen', true);
9-
}
10-
116
@action
127
togglePublishState() {
138
if (isEmpty(this.model.locationName)) {
@@ -46,29 +41,6 @@ export default class extends Controller {
4641
});
4742
}
4843

49-
@action
50-
deleteEvent() {
51-
this.set('isLoading', true);
52-
this.model.destroyRecord()
53-
.then(() => {
54-
this.transitionToRoute('events');
55-
this.notify.success(this.l10n.t('Event has been deleted successfully.'),
56-
{
57-
id: 'event_deleted_succ'
58-
});
59-
})
60-
.catch(() => {
61-
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
62-
{
63-
id: 'event_deleted_error'
64-
});
65-
})
66-
.finally(() => {
67-
this.set('isLoading', false);
68-
});
69-
this.set('isEventDeleteModalOpen', false);
70-
}
71-
7244
@action
7345
copyEvent() {
7446
this.set('isCopying', true);

app/controllers/events/view/settings.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@ import { action } from '@ember/object';
33

44
export default class extends Controller {
55

6+
@action
7+
openDeleteEventModal() {
8+
this.set('isEventDeleteModalOpen', true);
9+
}
10+
11+
@action
12+
deleteEvent() {
13+
this.set('isLoading', true);
14+
this.model.event.destroyRecord()
15+
.then(() => {
16+
this.transitionToRoute('events');
17+
this.notify.success(this.l10n.t('Event has been deleted successfully.'),
18+
{
19+
id: 'event_deleted_succ'
20+
});
21+
})
22+
.catch(() => {
23+
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
24+
{
25+
id: 'event_deleted_error'
26+
});
27+
})
28+
.finally(() => {
29+
this.set('isLoading', false);
30+
});
31+
this.set('isEventDeleteModalOpen', false);
32+
}
33+
634
@action
735
openEventTransferModal(id, name) {
836
this.setProperties({

app/templates/events/view.hbs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<button class="ui button {{if isCopying 'loading'}}" {{action 'copyEvent'}} data-tooltip={{t 'Copy'}} data-position="top left">
3030
<i class="copy icon"></i>
3131
</button>
32-
<button class="ui red button" {{action 'openDeleteEventModal'}} data-tooltip={{t 'Delete'}} data-position="top left"><i class="trash icon"></i></button>
3332
</div>
3433
{{else}}
3534
<a href="{{model.url}}" class="ui button labeled icon small">
@@ -51,10 +50,6 @@
5150
{{t 'Copy'}}
5251
</button>
5352
</div>
54-
<button class="ui red button labeled icon small" {{action 'openDeleteEventModal'}}>
55-
<i class="trash icon"></i>
56-
{{t 'Delete'}}
57-
</button>
5853
{{/if}}
5954
</div>
6055
</div>
@@ -90,10 +85,6 @@
9085
</div>
9186
</div>
9287

93-
{{modals/event-delete-modal isLoading=isLoading
94-
isOpen=isEventDeleteModalOpen
95-
eventName=model.name
96-
deleteEvent=(action 'deleteEvent')}}
9788
<div class="ui {{if isLoading 'loading'}} basic segment">
9889
{{outlet}}
9990
</div>

app/templates/events/view/settings.hbs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,21 @@
22
<p>
33
{{t 'Transfer ownership of this event to another user. You\'ll lose all the owner rights once they accept the ownership.'}}
44
</p>
5-
<button {{action 'openEventTransferModal' model.event.id model.event.name}} class='ui red button'>
5+
<button {{action 'openEventTransferModal'}} class='ui red button'>
66
{{t 'Transfer Ownership'}}
77
</button>
8+
<div class="ui divider"></div>
9+
<p>
10+
{{t 'Once you delete an event, there is no going back. Please be certain'}}
11+
</p>
12+
<button {{action 'openDeleteEventModal'}} class='ui red labeled icon button'>
13+
<i class="trash icon"></i>
14+
{{t 'Delete Event'}}
15+
</button>
816
</div>
917
{{modals/event-transfer-modal isLoading=isLoading isOpen=isEventTransferModalOpen confirmEventName=confirmEventName eventName=eventName openConfirmEventTransferModal=(action 'openConfirmEventTransferModal') transferEvent=(action 'transferEvent' model)}}
1018
{{modals/confirm-event-transfer-modal currentInvite=currentInvite isLoading=isLoading isOpen=isConfirmEventTransferModalOpen checked=checked transferEvent=(action 'transferEvent')}}
19+
{{modals/event-delete-modal isLoading=isLoading
20+
isOpen=isEventDeleteModalOpen
21+
eventName=model.event.name
22+
deleteEvent=(action 'deleteEvent')}}

0 commit comments

Comments
 (0)