Skip to content

Commit

Permalink
chore: Release 1.8.1 (#3784)
Browse files Browse the repository at this point in the history
chore: Release 1.8.1
  • Loading branch information
iamareebjamal authored Jan 9, 2020
2 parents 866c2b9 + 765459e commit d8e2cdb
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 12 deletions.
5 changes: 0 additions & 5 deletions app/components/forms/orders/order-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { run } from '@ember/runloop';
import { inject as service } from '@ember/service';
import FormMixin from 'open-event-frontend/mixins/form';
import moment from 'moment';
import { countries } from 'open-event-frontend/utils/dictionary/demography';
import { groupBy, orderBy } from 'lodash-es';
import {
compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
Expand Down Expand Up @@ -467,10 +466,6 @@ export default Component.extend(FormMixin, {
return groupBy(this.fields.toArray(), field => field.get('form'));
}),

countries: computed(function() {
return orderBy(countries, 'name');
}),

genders: orderBy(genders, 'name'),

actions: {
Expand Down
10 changes: 10 additions & 0 deletions app/components/widgets/forms/billing-info.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { countries } from 'open-event-frontend/utils/dictionary/demography';
import Component from '@ember/component';
import { computed } from '@ember/object';
import { orderBy } from 'lodash-es';

export default Component.extend({
countries: computed(function() {
return orderBy(countries, 'name');
})
});
2 changes: 1 addition & 1 deletion app/routes/events/view/sessions/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default Route.extend({
return {
event : eventDetails,
form : await eventDetails.query('customForms', {
'page[size]' : 50,
'page[size]' : 0,
sort : 'id'
}),
speakers: await eventDetails.query('speakers', {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/sessions/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
return {
event : eventDetails,
form : await eventDetails.query('customForms', {
'page[size]' : 50,
'page[size]' : 0,
sort : 'id'
}),
session: await this.store.findRecord('session', params.session_id, {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/speakers/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default Route.extend({
return {
event : eventDetails,
form : await eventDetails.query('customForms', {
'page[size]' : 50,
'page[size]' : 0,
sort : 'id'
}),
session: await this.store.createRecord('session', {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/speakers/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
return {
event : eventDetails,
form : await eventDetails.query('customForms', {
'page[size]' : 50,
'page[size]' : 0,
sort : 'id'
}),
speaker: await this.store.findRecord('speaker', params.speaker_id)
Expand Down
2 changes: 1 addition & 1 deletion app/routes/public/cfs/edit-session.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default Route.extend({
event : eventDetails,
forms : await eventDetails.query('customForms', {
sort : 'id',
'page[size]' : 50
'page[size]' : 0
}),
session: await this.store.findRecord('session', params.session_id, {
include: 'session-type,track'
Expand Down
2 changes: 1 addition & 1 deletion app/routes/public/cfs/edit-speaker.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default Route.extend({
event : eventDetails,
forms : await eventDetails.query('customForms', {
sort : 'id',
'page[size]' : 50
'page[size]' : 0
}),
speaker: await this.store.findRecord('speaker', params.speaker_id)
};
Expand Down
4 changes: 3 additions & 1 deletion app/utils/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const isFileValid = (file, maxSizeInMb, fileTypes = []) => {
header += arr[i].toString(16);
}
let type;
// Magic number reference: from http://www.astro.keele.ac.uk/oldusers/rno/Computing/File_magic.html
// Magic number reference: from http://www.astro.keele.ac.uk/oldusers/rno/Computing/File_magic.html & http://en.wikipedia.org/wiki/List_of_file_signatures
switch (header) {
case '89504e47':
type = 'image/png';
Expand All @@ -44,6 +44,8 @@ export const isFileValid = (file, maxSizeInMb, fileTypes = []) => {
case 'ffd8ffe0':
case 'ffd8ffe1':
case 'ffd8ffe2':
case 'ffd8ffdb':
case 'ffd8ffee':
type = 'image/jpeg';
break;
case '25504446':
Expand Down

0 comments on commit d8e2cdb

Please sign in to comment.