tqt/Ghost-Admin
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost-Admin.git synced 2023-12-14 02:33:04 +01:00
Code Issues Releases Wiki Activity

PostSettingsMenu: Don't save new posts, reset values on failure

Browse source 
Closes #3158, Closes #3143, Closes #3134
- Added `model.rollback()` when PSM fails to save.
- Added `showErrors` and `showSuccess` helper functions to PSM to abstract
  closing and showing of notifications.
- Added `togglePage` action to indirect the setting of `page`.
- Removed `isStaticPage` property in favor of `togglePage` action
- moved `updateSlug` error catching to outer promise (slugGenerator promise)
- modifying the `page` and `published_at` properties will no longer cause a new post to save
- Close passive notifications on published date parse fail
- Removed promise creation in catch statements

- Changed tests to click on label, rather than the input for
  .post-setting-static-page.
This commit is contained in:
Matt Enlow 2014-07-01 06:18:47 -06:00
parent 2019500466
commit c68704a312
2 changed files with 55 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
controllers/post-settings-menu.js
View file

@ -13,24 +13,6 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
this.addObserver('title', this, 'titleObserver');
}
},
isStaticPage: function (key, val) {
var self = this;
if (arguments.length > 1) {
this.set('page', val);
return this.get('model').save().then(function () {
self.notifications.showSuccess('Successfully converted to ' + (val ? 'static page' : 'post'));
return self.get('page');
}).catch(function (errors) {
self.notifications.showErrors(errors);
return Ember.RSVP.reject(errors);
});
}
return this.get('page');
}.property('page'),
/**
* The placeholder is the published date of the post,
* or the current date if the pubdate has not been set.
@ -47,14 +29,15 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
slugValue: boundOneWay('slug'),
//Lazy load the slug generator for slugPlaceholder
slugGenerator: Ember.computed(function () {
return SlugGenerator.create({ghostPaths: this.get('ghostPaths')});
return SlugGenerator.create({
ghostPaths: this.get('ghostPaths')
});
}),
//Requests slug from title
generateSlugPlaceholder: function () {
var self = this,
slugGenerator = this.get('slugGenerator'),
title = this.get('title');
slugGenerator.generateSlug(title).then(function (slug) {
this.get('slugGenerator').generateSlug(title).then(function (slug) {
self.set('slugPlaceholder', slug);
});
},
@ -80,7 +63,34 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return this.get('title');
}.property(),
showErrors: function (errors) {
errors = Ember.isArray(errors) ? errors : [errors];
this.notifications.closePassive();
this.notifications.showErrors(errors);
},
showSuccess: function (message) {
this.notifications.closePassive();
this.notifications.showSuccess(message);
},
actions: {
togglePage: function () {
var value = this.toggleProperty('page'),
self = this;
// If this is a new post. Don't save the model. Defer the save
// to the user pressing the save button
if (this.get('isNew')) {
return;
}
return this.get('model').save().then(function () {
self.showSuccess('Successfully converted to ' + (value ? 'static page' : 'post'));
return value;
}).catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});
},
/**
* triggered by user manually changing slug
*/
@ -135,13 +145,13 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
}
// Save post model properties excluding any changes to the post body
return self.get('model').save().then(function () {
self.notifications.showSuccess('Permalink successfully changed to <strong>' +
self.get('slug') + '</strong>.');
}).catch(function (errors) {
self.notifications.showErrors(errors);
return Ember.RSVP.reject(errors);
});
return self.get('model').save();
}).then(function () {
self.showSuccess('Permalink successfully changed to <strong>' +
self.get('slug') + '</strong>.');
}).catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});
},
@ -164,37 +174,41 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
// Do nothing if the user didn't actually change the date
if (publishedAt && publishedAt.isSame(newPublishedAt)) {
return;
}
// Validate new Published date
if (!newPublishedAt.isValid()) {
errMessage = 'Published Date must be a valid date with format: ' +
'DD MMM YY @ HH:mm (e.g. 6 Dec 14 @ 15:00)';
}
//Can't publish in the future yet
if (newPublishedAt.diff(new Date(), 'h') > 0) {
errMessage = 'Published Date cannot currently be in the future.';
}
//If errors, notify and exit.
if (errMessage) {
this.notifications.showError(errMessage);
this.showErrors(errMessage);
return;
}
// Do nothing if the user didn't actually change the date
if (publishedAt && publishedAt.isSame(newPublishedAt)) {
return;
}
//Validation complete
this.set('published_at', newPublishedAt);
// If this is a new post. Don't save the model. Defer the save
// to the user pressing the save button
if (this.get('isNew')) {
return;
}
this.get('model').save().then(function () {
self.notifications.showSuccess('Publish date successfully changed to <strong>' +
self.showSuccess('Publish date successfully changed to <strong>' +
formatDate(self.get('published_at')) + '</strong>.');
}).catch(function (errors) {
self.notifications.showErrors(errors);
return Ember.RSVP.reject(errors);
self.showErrors(errors);
self.get('model').rollback();
});
}
}

4
templates/post-settings-menu.hbs
View file

@ -22,8 +22,8 @@
<label class="label" for="static-page">Static Page</label>
</td>
<td class="post-setting-item">
{{input type="checkbox" name="static-page" id="static-page" class="post-setting-static-page" checked=isStaticPage}}
<label class="checkbox" for="static-page"></label>
{{input type="checkbox" name="static-page" id="static-page" class="post-setting-static-page" checked=page}}
<label class="checkbox" for="static-page" {{action 'togglePage' bubbles="false"}}></label>
</td>
</tr>
</tbody>