NoLog.cz/decide.nolog.cz
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix: confusing validation present error for answer selection in poll participation

Browse source
This commit is contained in:
jelhan 2016-06-27 12:53:05 +02:00
parent 0460fe56b1
commit 2e128e3c3c
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/poll/participation.js
View file

@ -55,7 +55,14 @@ const SelectionValidations = buildValidations({
return true; return true;
} }
}, },
dependentKeys: ['forceAnswer', 'i18n.locale'] messageKey() {
if (this.get('model.isFreeText')) {
return 'errors.present';
} else {
return 'errors.present.answer.selection';
}
},
dependentKeys: ['isFreeText', 'forceAnswer', 'i18n.locale']
}) })
}); });
@ -204,9 +211,10 @@ export default Ember.Controller.extend(Validations, {
return Ember.Object.extend(SelectionValidations, { return Ember.Object.extend(SelectionValidations, {
container, container,
// force Answer must be included in model // forceAnswer and isFreeText must be included in model
// cause otherwise validations can't depend on it // cause otherwise validations can't depend on it
forceAnswer: this.get('forceAnswer'), forceAnswer: this.get('forceAnswer'),
isFreeText: this.get('isFreeText'),
// a little bit hacky // a little bit hacky
// wasn't able to observe moment.locale since it should be in sync // wasn't able to observe moment.locale since it should be in sync

1
app/locales/de/translations.js
View file

@ -101,6 +101,7 @@ export default {
empty: '{{description}} darf nicht leer sein', empty: '{{description}} darf nicht leer sein',
blank: '{{description}} darf nicht leer sein', blank: '{{description}} darf nicht leer sein',
present: '{{description}} muss leer sein', present: '{{description}} muss leer sein',
'present.answer.selection': 'Eine Antwort muss ausgewählt sein',
collection: '{{description}} muss eine Sammlung sein', collection: '{{description}} muss eine Sammlung sein',
singular: '{{description}} darf keine Sammlung sein', singular: '{{description}} darf keine Sammlung sein',
tooLong: '{{description}} ist zu lang (maximal {{max}} Zeichen)', tooLong: '{{description}} ist zu lang (maximal {{max}} Zeichen)',

1
app/locales/en/translations.js
View file

@ -101,6 +101,7 @@ export default {
empty: '{{description}} must not be empty', empty: '{{description}} must not be empty',
blank: '{{description}} must not be empty', blank: '{{description}} must not be empty',
present: '{{description}} must be empty', present: '{{description}} must be empty',
'present.answer.selection': 'An answer must be selected',
collection: '{{description}} must be a collection', collection: '{{description}} must be a collection',
singular: '{{description}} must not be a collection', singular: '{{description}} must not be a collection',
tooLong: '{{description}} is too long (maxl {{max}} characters)', tooLong: '{{description}} is too long (maxl {{max}} characters)',

1
app/locales/es/translations.js
View file

@ -101,6 +101,7 @@ export default {
empty: '{{description}} can\'t be empty', empty: '{{description}} can\'t be empty',
blank: '{{description}} can\'t be blank', blank: '{{description}} can\'t be blank',
present: '{{description}} must be blank', present: '{{description}} must be blank',
'present.answer.selection': 'An answer must be selected',
collection: '{{description}} must be a collection', collection: '{{description}} must be a collection',
singular: '{{description}} can\'t be a collection', singular: '{{description}} can\'t be a collection',
tooLong: '{{description}} is too long (maximum is {{max}} characters)', tooLong: '{{description}} is too long (maximum is {{max}} characters)',