github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-07 20:33:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: deleting own post results in error

Browse Source
This commit is contained in:
Sam 2017-07-28 10:14:11 -04:00
parent e84e310325
commit ae68795d82
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
View File

@ -1,7 +1,7 @@
import { default as computed } from "ember-addons/ember-computed-decorators"; import { default as computed } from "ember-addons/ember-computed-decorators";
import PreferencesTabController from "discourse/mixins/preferences-tab-controller"; import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
import { popupAjaxError } from 'discourse/lib/ajax-error'; import { popupAjaxError } from 'discourse/lib/ajax-error';
import { cook } from 'discourse/lib/text'; import { cookAsync } from 'discourse/lib/text';
export default Ember.Controller.extend(PreferencesTabController, { export default Ember.Controller.extend(PreferencesTabController, {
@ -57,9 +57,12 @@ export default Ember.Controller.extend(PreferencesTabController, {
} }
} }
return model.save(this.get('saveAttrNames')).then(() => { return model.save(this.get('saveAttrNames')).then(() => {
model.set('bio_cooked', cook(model.get('bio_raw'))); cookAsync(model.get('bio_raw')).then(()=>{
this.set('saved', true); model.set('bio_cooked', );
this.set('saved', true);
}).catch(popupAjaxError);
}).catch(popupAjaxError); }).catch(popupAjaxError);
} }
} }

18
app/assets/javascripts/discourse/models/post.js.es6
View File

@ -6,7 +6,7 @@ import { propertyEqual } from 'discourse/lib/computed';
import Quote from 'discourse/lib/quote'; import Quote from 'discourse/lib/quote';
import computed from 'ember-addons/ember-computed-decorators'; import computed from 'ember-addons/ember-computed-decorators';
import { postUrl } from 'discourse/lib/utilities'; import { postUrl } from 'discourse/lib/utilities';
import { cook } from 'discourse/lib/text'; import { cookAsync } from 'discourse/lib/text';
import { userPath } from 'discourse/lib/url'; import { userPath } from 'discourse/lib/url';
import Composer from 'discourse/models/composer'; import Composer from 'discourse/models/composer';
@ -170,13 +170,15 @@ const Post = RestModel.extend({
}); });
} else { } else {
this.setProperties({ cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => {
cooked: cook(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})), this.setProperties({
can_delete: false, cooked: cooked,
version: this.get('version') + 1, can_delete: false,
can_recover: true, version: this.get('version') + 1,
can_edit: false, can_recover: true,
user_deleted: true can_edit: false,
user_deleted: true
});
}); });
} }
}, },