Skip to content

fix: infinite loader on sessions page #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2019
Merged

fix: infinite loader on sessions page #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11777a0
fix: infinite loader on sessions page
abhinavk96 Jul 31, 2019
b55486f
Merge branch 'development' into gamma
kushthedude Jul 31, 2019
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
3 changes: 2 additions & 1 deletion app/controllers/public/cfs/new-session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Controller from '@ember/controller';
export default Controller.extend({
actions: {
async save(speakerDetails) {
this.set('isLoading', true);
try {
this.set('isLoading', true);
await this.get('model.session').save();
speakerDetails.sessions.pushObject(this.get('model.session'));
await this.get('model.session').save();
Expand All @@ -12,6 +12,7 @@ export default Controller.extend({
} catch (e) {
this.notify.error(this.l10n.t('Oops something went wrong. Please try again'));
}
this.set('isLoading', false);
}
}
});
6 changes: 4 additions & 2 deletions app/routes/public/cfs/new-session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ export default Route.extend({
'page[size]' : 50
}),
session: await this.store.createRecord('session', {
event : eventDetails,
creator : this.get('authManager.currentUser')
event : eventDetails,
creator : this.get('authManager.currentUser'),
track : null,
sessionType : null
}),
speaker: await eventDetails.query('speakers', {
filter: [
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/forms/session-speaker-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
</div>
{{/ui-dropdown}}
{{else}}
{{#ui-dropdown class='search selection' onChange=(action (mut (get data.session field.fieldIdentifier))) as |execute mapper|}}
{{input type='hidden' name=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier)) value=data.session.fieldIdentifier}}
{{#ui-dropdown class='search selection' selected=(get data.session field.fieldIdentifier) onChange=(action (mut (get data.session field.fieldIdentifier))) as |execute mapper|}}
{{input type='hidden' name=(if field.isRequired (concat 'session_' field.fieldIdentifier '_required') (concat 'session_' field.fieldIdentifier)) value=(if (get data.session field.fieldIdentifier) (get data.session field.fieldIdentifier) null)}}
<i class="dropdown icon"></i>
<div class="default text">
{{if (get data.session field.fieldIdentifier) (custom-related-field data.session field.fieldIdentifier 'name') (concat 'Select a ' field.name)}}
Expand Down