Skip to content

Commit eb06b4e

Browse files
shreyanshdwivediabhinavk96
authored andcommitted
feat: introduce event owner role to the system (#3229)
1 parent 928f7d1 commit eb06b4e

File tree

15 files changed

+52
-33
lines changed

15 files changed

+52
-33
lines changed

app/models/admin-statistics-user.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default ModelBase.extend({
77
admin : attr('number'),
88
verified : attr('number'),
99
unverified : attr('number'),
10+
owner : attr('number'),
1011
organizer : attr('number'),
1112
coorganizer : attr('number'),
1213
attendee : attr('number'),

app/models/event.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
7171

7272
schedulePublishedOn: attr('moment', { defaultValue: () => moment(0) }),
7373

74-
hasOrganizerInfo: attr('boolean', { defaultValue: false }),
74+
hasOwnerInfo: attr('boolean', { defaultValue: false }),
7575

76-
organizerName : attr('string'),
77-
organizerDescription : attr('string'),
76+
ownerName : attr('string'),
77+
ownerDescription : attr('string'),
7878

7979
externalEventUrl : attr('string'),
8080
ticketUrl : attr('string'),
@@ -120,6 +120,7 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
120120
orderStatistics : belongsTo('order-statistics-event'),
121121
roleInvites : hasMany('role-invite'),
122122

123+
owner : belongsTo('user', { inverse: null }),
123124
organizers : hasMany('user', { inverse: null }),
124125
coorganizers : hasMany('user', { inverse: null }),
125126
trackOrganizers : hasMany('user', { inverse: null }),

app/models/user.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export default ModelBase.extend({
1616
isVerified : attr('boolean', { readOnly: true }),
1717
isSuperAdmin : attr('boolean', { readOnly: true }),
1818
isAdmin : attr('boolean'),
19+
isUserOwner : attr('boolean'),
1920
isUserOrganizer : attr('boolean'),
2021
isUserCoorganizer : attr('boolean'),
2122
isUserTrackOrganizer : attr('boolean'),
@@ -72,6 +73,7 @@ export default ModelBase.extend({
7273
speakers : hasMany('speaker'),
7374
discountCodes : hasMany('discount-code'),
7475
accessCodes : hasMany('access-code'),
76+
ownerEvents : hasMany('event'),
7577
organizerEvents : hasMany('event'),
7678
coorganizerEvents : hasMany('event'),
7779
trackOrganizerEvents : hasMany('event'),

app/routes/admin/events/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default Route.extend({
112112

113113
return this.store.query('event', {
114114
get_trashed : true,
115-
include : 'tickets,sessions,speakers,organizers,coorganizers,track-organizers,registrars,moderators',
115+
include : 'tickets,sessions,speakers,owner,organizers,coorganizers,track-organizers,registrars,moderators',
116116
filter : filterOptions,
117117
'page[size]' : 10
118118
});

app/routes/admin/permissions/event-roles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export default Route.extend({
66
},
77
async model() {
88
return {
9-
roles : ['Attendee', 'Co-organizer', 'Moderator', 'Organizer', 'Track Organizer', 'Registrar'],
9+
roles : ['Attendee', 'Co-organizer', 'Moderator', 'Organizer', 'Owner', 'Track Organizer', 'Registrar'],
1010
services : await this.store.query('service', {}),
11-
permissions : await this.store.query('event-role-permission', { 'page[size]': 30 })
11+
permissions : await this.store.query('event-role-permission', { 'page[size]': 35 })
1212
};
1313
}
1414
});

app/routes/events/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default Route.extend({
7777
}
7878

7979
let queryObject = {
80-
include : 'tickets,sessions,speakers,organizers,coorganizers,track-organizers,registrars,moderators',
80+
include : 'tickets,sessions,speakers,owner,organizers,coorganizers,track-organizers,registrars,moderators',
8181
filter : filterOptions,
8282
'page[size]' : 10
8383
};

app/templates/admin/index.hbs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@
165165
</h3>
166166
<table class="ui celled table">
167167
<tbody>
168+
<tr>
169+
<td>{{t 'No. of Owners'}}</td>
170+
<td class="right aligned">{{model.users.owner}}</td>
171+
</tr>
168172
<tr>
169173
<td>{{t 'No. of Organizers'}}</td>
170174
<td class="right aligned">{{model.users.organizer}}</td>

app/templates/components/forms/wizard/basic-details-step.hbs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,19 @@
101101
<div class="ui section divider"></div>
102102
<div class="field">
103103
<div class="ui slider checkbox">
104-
{{input type='checkbox' checked=data.event.hasOrganizerInfo id='add_organizer_information'}}
105-
<label for="add_organizer_information">{{t 'Add organizer information'}}</label>
104+
{{input type='checkbox' checked=data.event.hasOwnerInfo id='add_owner_information'}}
105+
<label for="add_owner_information">{{t 'Add owner information'}}</label>
106106
</div>
107107
</div>
108108

109-
{{#if data.event.hasOrganizerInfo}}
109+
{{#if data.event.hasOwnerInfo}}
110110
<div class="field">
111-
<label for="organizer_name">{{t 'Organizer Name'}}</label>
112-
{{input type='text' id='organizer_name' value=data.event.organizerName}}
111+
<label for="owner_name">{{t 'Owner Name'}}</label>
112+
{{input type='text' id='owner_name' value=data.event.ownerName}}
113113
</div>
114114
<div class="field">
115-
<label for="organizer_description">{{t 'Organizer Description'}}</label>
116-
{{widgets/forms/rich-text-editor id='organizer_description' value=data.event.organizerDescription}}
115+
<label for="owner_description">{{t 'Owner Description'}}</label>
116+
{{widgets/forms/rich-text-editor id='owner_description' value=data.event.ownerDescription}}
117117
</div>
118118
{{/if}}
119119
<div class="ui section divider"></div>

app/templates/components/orders/event-info.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<strong>{{t 'From'}}:</strong> {{header-date data.event.startsAt}}
1818
<br>
1919
<strong>{{t 'To'}}:</strong> {{header-date data.event.endsAt}}
20-
{{#if data.event.organizerName}}
20+
{{#if data.event.ownerName}}
2121
<br>
22-
<strong>{{t 'Organized By'}}:</strong> {{data.event.organizerName}}
22+
<strong>{{t 'Organized By'}}:</strong> {{data.event.ownerName}}
2323
{{/if}}
2424
</div>
2525
<div class="ui padded segment">
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="ui segments">
22
<div class="ui secondary segment">
3-
<h3 class="weight-400">{{t 'Organizer '}}</h3>
3+
<h3 class="weight-400">{{t 'Owner '}}</h3>
44
</div>
55
<div class="ui padded segment">
6-
<h3>{{data.event.organizerName}}</h3>
6+
<h3>{{data.event.ownerName}}</h3>
77
<br>
8-
{{sanitize data.event.organizerDescription}}
8+
{{sanitize data.event.ownerDescription}}
99
</div>
1010
</div>

0 commit comments

Comments
 (0)