github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:47:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: dual modal when deleting spammer in the flag modal

Browse Source
This commit is contained in:
Régis Hanol 2014-08-29 13:05:51 +02:00
parent 521cb6bd0d
commit fd6dd88afb
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,18 +15,6 @@ Discourse.AdminFlagsRouteType = Discourse.Route.extend({
adminFlagsController.set('query', this.get('filter'));
},
actions: {
/**
Deletes a user and all posts and topics created by that user.
@method deleteSpammer
**/
deleteSpammer: function (user) {
this.send('closeModal');
user.deleteAsSpammer(function() { window.location.reload(); });
}
}
});
Discourse.AdminFlagsActiveRoute = Discourse.AdminFlagsRouteType.extend({

9
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -136,7 +136,16 @@ var ApplicationRoute = Em.Route.extend({
router.controllerFor('editCategory').set('selectedTab', 'general');
});
}
},
/**
Deletes a user and all posts and topics created by that user.
@method deleteSpammer
**/
deleteSpammer: function (user) {
this.send('closeModal');
user.deleteAsSpammer(function() { window.location.reload(); });
}
},

3
app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
View File

@ -28,7 +28,6 @@
{{/if}}
{{#if canDeleteSpammer}}
<button class="btn btn-danger" {{action deleteSpammer}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
<button class="btn btn-danger" {{action deleteSpammer userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
{{/if}}
</div>