Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Merge pull request #5783 from kevinansfield/validation-fixes

Browse source 
Minor validations fixes
This commit is contained in:
Hannah Wolfe 2015-09-02 11:53:13 +01:00
commit 6cdc8be756
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/client/app/controllers/settings/general.js
View file

@ -58,6 +58,7 @@ export default Ember.Controller.extend(SettingsSaveMixin, {
}).readOnly(),
generatePassword: Ember.observer('model.isPrivate', function () {
this.get('model.errors').remove('password');
if (this.get('model.isPrivate') && this.get('model.isDirty')) {
this.get('model').set('password', randomPassword());
}

2
core/client/app/controllers/settings/tags.js
View file

@ -111,10 +111,12 @@ export default Ember.Controller.extend(PaginationMixin, SettingsMenuMixin, {
actions: {
newTag: function () {
this.set('activeTag', this.store.createRecord('tag', {post_count: 0}));
this.get('activeTag.errors').clear();
this.send('openSettingsMenu');
},
editTag: function (tag) {
tag.validate();
this.set('activeTag', tag);
this.send('openSettingsMenu');
},

3
core/client/app/validators/tag-settings.js
View file

@ -11,6 +11,9 @@ var TagSettingsValidator = BaseValidator.create({
} else if (name.match(/^,/)) {
model.get('errors').add('name', 'Tag names can\'t start with commas.');
this.invalidate();
} else if (!validator.isLength(name, 0, 150)) {
model.get('errors').add('name', 'Tag names cannot be longer than 150 characters.');
this.invalidate();
}
},
metaTitle: function (model) {