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

FIX: dual modal when selecting 'delete spammer' in flags section

This commit is contained in:
Régis Hanol 2014-08-29 12:54:24 +02:00
parent 8bda8a2235
commit 521cb6bd0d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/routes/admin_flags_route.js
View File

@ -22,6 +22,7 @@ Discourse.AdminFlagsRouteType = Discourse.Route.extend({
@method deleteSpammer
**/
deleteSpammer: function (user) {
this.send('closeModal');
user.deleteAsSpammer(function() { window.location.reload(); });
}
}
@ -50,6 +51,3 @@ Discourse.AdminFlagsActiveRoute = Discourse.AdminFlagsRouteType.extend({
Discourse.AdminFlagsOldRoute = Discourse.AdminFlagsRouteType.extend({
filter: 'old'
});

7
app/assets/javascripts/discourse/controllers/flag.js.es6
View File

@ -105,7 +105,7 @@ export default ObjectController.extend(ModalFunctionality, {
changePostActionType: function(action) {
this.set('selected', action);
}
},
},
canDeleteSpammer: function() {
@ -118,11 +118,6 @@ export default ObjectController.extend(ModalFunctionality, {
}
}.property('selected.name_key', 'userDetails.can_be_deleted', 'userDetails.can_delete_all_posts'),
deleteSpammer: function() {
this.send('closeModal');
this.get('userDetails').deleteAsSpammer(function() { window.location.reload(); });
},
usernameChanged: function() {
this.set('userDetails', null);
this.fetchUserDetails();