Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions app/models/admin-statistics-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default ModelBase.extend({
admin : attr('number'),
verified : attr('number'),
unverified : attr('number'),
owner : attr('number'),
organizer : attr('number'),
coorganizer : attr('number'),
attendee : attr('number'),
Expand Down
7 changes: 4 additions & 3 deletions app/models/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {

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

hasOrganizerInfo: attr('boolean', { defaultValue: false }),
hasOwnerInfo: attr('boolean', { defaultValue: false }),

organizerName : attr('string'),
organizerDescription : attr('string'),
ownerName : attr('string'),
ownerDescription : attr('string'),

externalEventUrl : attr('string'),
ticketUrl : attr('string'),
Expand Down Expand Up @@ -120,6 +120,7 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
orderStatistics : belongsTo('order-statistics-event'),
roleInvites : hasMany('role-invite'),

owner : belongsTo('user', { inverse: null }),
organizers : hasMany('user', { inverse: null }),
coorganizers : hasMany('user', { inverse: null }),
trackOrganizers : hasMany('user', { inverse: null }),
Expand Down
2 changes: 2 additions & 0 deletions app/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default ModelBase.extend({
isVerified : attr('boolean', { readOnly: true }),
isSuperAdmin : attr('boolean', { readOnly: true }),
isAdmin : attr('boolean'),
isUserOwner : attr('boolean'),
isUserOrganizer : attr('boolean'),
isUserCoorganizer : attr('boolean'),
isUserTrackOrganizer : attr('boolean'),
Expand Down Expand Up @@ -72,6 +73,7 @@ export default ModelBase.extend({
speakers : hasMany('speaker'),
discountCodes : hasMany('discount-code'),
accessCodes : hasMany('access-code'),
ownerEvents : hasMany('event'),
organizerEvents : hasMany('event'),
coorganizerEvents : hasMany('event'),
trackOrganizerEvents : hasMany('event'),
Expand Down
2 changes: 1 addition & 1 deletion app/routes/admin/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default Route.extend({

return this.store.query('event', {
get_trashed : true,
include : 'tickets,sessions,speakers,organizers,coorganizers,track-organizers,registrars,moderators',
include : 'tickets,sessions,speakers,owner,organizers,coorganizers,track-organizers,registrars,moderators',
filter : filterOptions,
'page[size]' : 10
});
Expand Down
4 changes: 2 additions & 2 deletions app/routes/admin/permissions/event-roles.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export default Route.extend({
},
async model() {
return {
roles : ['Attendee', 'Co-organizer', 'Moderator', 'Organizer', 'Track Organizer', 'Registrar'],
roles : ['Attendee', 'Co-organizer', 'Moderator', 'Organizer', 'Owner', 'Track Organizer', 'Registrar'],
services : await this.store.query('service', {}),
permissions : await this.store.query('event-role-permission', { 'page[size]': 30 })
permissions : await this.store.query('event-role-permission', { 'page[size]': 35 })
};
}
});
2 changes: 1 addition & 1 deletion app/routes/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default Route.extend({
}

let queryObject = {
include : 'tickets,sessions,speakers,organizers,coorganizers,track-organizers,registrars,moderators',
include : 'tickets,sessions,speakers,owner,organizers,coorganizers,track-organizers,registrars,moderators',
filter : filterOptions,
'page[size]' : 10
};
Expand Down
4 changes: 4 additions & 0 deletions app/templates/admin/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@
</h3>
<table class="ui celled table">
<tbody>
<tr>
<td>{{t 'No. of Owners'}}</td>
<td class="right aligned">{{model.users.owner}}</td>
</tr>
<tr>
<td>{{t 'No. of Organizers'}}</td>
<td class="right aligned">{{model.users.organizer}}</td>
Expand Down
14 changes: 7 additions & 7 deletions app/templates/components/forms/wizard/basic-details-step.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@
<div class="ui section divider"></div>
<div class="field">
<div class="ui slider checkbox">
{{input type='checkbox' checked=data.event.hasOrganizerInfo id='add_organizer_information'}}
<label for="add_organizer_information">{{t 'Add organizer information'}}</label>
{{input type='checkbox' checked=data.event.hasOwnerInfo id='add_owner_information'}}
<label for="add_owner_information">{{t 'Add owner information'}}</label>
</div>
</div>

{{#if data.event.hasOrganizerInfo}}
{{#if data.event.hasOwnerInfo}}
<div class="field">
<label for="organizer_name">{{t 'Organizer Name'}}</label>
{{input type='text' id='organizer_name' value=data.event.organizerName}}
<label for="owner_name">{{t 'Owner Name'}}</label>
{{input type='text' id='owner_name' value=data.event.ownerName}}
</div>
<div class="field">
<label for="organizer_description">{{t 'Organizer Description'}}</label>
{{widgets/forms/rich-text-editor id='organizer_description' value=data.event.organizerDescription}}
<label for="owner_description">{{t 'Owner Description'}}</label>
{{widgets/forms/rich-text-editor id='owner_description' value=data.event.ownerDescription}}
</div>
{{/if}}
<div class="ui section divider"></div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/orders/event-info.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<strong>{{t 'From'}}:</strong> {{header-date data.event.startsAt}}
<br>
<strong>{{t 'To'}}:</strong> {{header-date data.event.endsAt}}
{{#if data.event.organizerName}}
{{#if data.event.ownerName}}
<br>
<strong>{{t 'Organized By'}}:</strong> {{data.event.organizerName}}
<strong>{{t 'Organized By'}}:</strong> {{data.event.ownerName}}
{{/if}}
</div>
<div class="ui padded segment">
Expand Down
6 changes: 3 additions & 3 deletions app/templates/components/orders/organizer-info.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="ui segments">
<div class="ui secondary segment">
<h3 class="weight-400">{{t 'Organizer '}}</h3>
<h3 class="weight-400">{{t 'Owner '}}</h3>
</div>
<div class="ui padded segment">
<h3>{{data.event.organizerName}}</h3>
<h3>{{data.event.ownerName}}</h3>
<br>
{{sanitize data.event.organizerDescription}}
{{sanitize data.event.ownerDescription}}
</div>
</div>
10 changes: 5 additions & 5 deletions app/templates/components/public/side-menu.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
{{t 'Call for Speakers'}}
{{/link-to}}
{{/if}}
{{#if event.hasOrganizerInfo}}
{{#if event.hasOwnerInfo}}
{{#if (eq session.currentRouteName 'public.index')}}
{{#scroll-to href='#organizer' class='item'}}
{{t 'Organizer'}}
{{#scroll-to href='#owner' class='item'}}
{{t 'Owner'}}
{{/scroll-to}}
{{else}}
<a class="item" href="{{href-to 'public.index'}}#organizer">
{{t 'Organizer'}}
<a class="item" href="{{href-to 'public.index'}}#owner">
{{t 'Owner'}}
</a>
{{/if}}
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
{{#if (or record.isAdmin record.isSuperAdmin)}}
{{t 'User has administrative privileges, he has privileges of the following roles for all the events:'}}
<div class="item">
<span class="ui tiny basic green label">{{t 'Organizer'}}</span>
<span class="ui tiny basic green label">{{t 'Owner'}}</span>
</div>
<div class="item">
<span class="ui tiny basic orange label">{{t 'Co organizer'}}</span>
<span class="ui tiny basic orange label">{{t 'Organizer'}}</span>
</div>
<div class="item">
<span class="ui tiny basic yellow label">{{t 'Track Organizer'}}</span>
<span class="ui tiny basic yellow label">{{t 'Co organizer'}}</span>
</div>
<div class="item">
<span class="ui tiny basic red label">{{t 'Track Organizer'}}</span>
</div>
<div class="item">
<span class="ui tiny basic purple label">{{t 'Registrar'}}</span>
Expand All @@ -23,10 +26,17 @@
<span class="ui tiny basic brown label">{{t 'Sales Admin'}}</span>
</div>
{{else}}
{{#if record.isUserOwner}}
{{#each record.ownerEvents as |event|}}
<div class="item">
{{#link-to 'events.view' event.identifier}}{{event.name}}{{/link-to}} - <span class="ui tiny basic black label">{{t 'Owner'}}</span>
</div>
{{/each}}
{{/if}}
{{#if record.isUserOrganizer}}
{{#each record.organizerEvents as |event|}}
<div class="item">
{{#link-to 'events.view' event.identifier}}{{event.name}}{{/link-to}} - <span class="ui tiny basic black label">{{t 'Organizer'}}</span>
{{#link-to 'events.view' event.identifier}}{{event.name}}{{/link-to}} - <span class="ui tiny basic orange label">{{t 'Organizer'}}</span>
</div>
{{/each}}
{{/if}}
Expand Down
1 change: 1 addition & 0 deletions app/templates/components/ui-table/cell/cell-roles.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div class="ui ordered list">
<div class="item">{{record.owner.email}} ({{t 'Owner'}})</div>
{{#each record.organizers as |role|}}
<div class="item">{{role.email}} ({{t 'Organizer'}})</div>
{{/each}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/orders/new.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{{forms/orders/order-form save='save' data=model.order fields=model.form}}
</div>
<div class="six wide column">
{{#if model.order.event.organizerName}}
{{#if model.order.event.ownerName}}
<div class="mobile hidden row">
{{orders/organizer-info data=model.order}}
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/templates/public/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
</div>
<div class="ui hidden divider"></div>
{{/if}}
{{#if model.event.hasOrganizerInfo}}
<h2 class="ui header" id="organizer">
{{t 'Organized by'}} {{model.event.organizerName}}
{{#if model.event.hasOwnerInfo}}
<h2 class="ui header" id="owner">
{{t 'Organized by'}} {{model.event.ownerName}}
</h2>
{{sanitize model.event.organizerDescription}}
{{sanitize model.event.ownerDescription}}
<div class="ui hidden divider"></div>
{{/if}}
<div class="location" id="getting-here">
Expand Down