Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3669 from tgxworld/fixes_for_destroy_recover_post 

Fixes for destroy recover post
This commit is contained in:
Régis Hanol 2015-08-19 11:37:42 +02:00
parent efd7fbd49d 33260f3203
commit 3ba929de9a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,9 @@ const Post = RestModel.extend({
// Recover a deleted post // Recover a deleted post
recover() { recover() {
const post = this; const post = this,
initProperties = post.getProperties('deleted_at', 'deleted_by', 'user_deleted', 'can_delete');
post.setProperties({ post.setProperties({
deleted_at: null, deleted_at: null,
deleted_by: null, deleted_by: null,
@ -178,6 +180,9 @@ const Post = RestModel.extend({
can_delete: true, can_delete: true,
version: data.version version: data.version
}); });
}).catch(function(error) {
popupAjaxError(error);
post.setProperties(initProperties);
}); });
}, },
@ -220,6 +225,7 @@ const Post = RestModel.extend({
cooked: this.get('oldCooked'), cooked: this.get('oldCooked'),
version: this.get('version') - 1, version: this.get('version') - 1,
can_recover: false, can_recover: false,
can_delete: true,
user_deleted: false user_deleted: false
}); });
} }