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 #1260 from sir-pinecone/reactivate-admin-refresh-btn 

Fix auto-group refresh response so that ajax callback runs
This commit is contained in:
Sam 2013-07-28 22:22:55 -07:00
parent 56f7c18b09 aa7e96c0fa
commit 22893e203a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/controllers/admin_groups_controller.js
View File

@ -10,7 +10,8 @@ Discourse.AdminGroupsController = Ember.Controller.extend({
var controller = this; var controller = this;
this.set('refreshingAutoGroups', true); this.set('refreshingAutoGroups', true);
Discourse.ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(function(){ Discourse.ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'})
.then(function() {
controller.set('model', Discourse.Group.findAll()); controller.set('model', Discourse.Group.findAll());
controller.set('refreshingAutoGroups', false); controller.set('refreshingAutoGroups', false);
}); });

2
app/assets/javascripts/admin/models/group.js
View File

@ -44,7 +44,7 @@ Discourse.Group = Discourse.Model.extend({
return Discourse.ajax("/admin/groups/" + group.get('id'), {type: "DELETE"}) return Discourse.ajax("/admin/groups/" + group.get('id'), {type: "DELETE"})
.then(function(){ .then(function(){
return true; return true;
}, function(jqXHR, status, error) { }, function(error) {
group.set('disableSave', false); group.set('disableSave', false);
bootbox.alert(I18n.t("admin.groups.delete_failed")); bootbox.alert(I18n.t("admin.groups.delete_failed"));
return false; return false;

4
app/controllers/admin/groups_controller.rb
View File

@ -6,7 +6,7 @@ class Admin::GroupsController < Admin::AdminController
def refresh_automatic_groups def refresh_automatic_groups
Group.refresh_automatic_groups! Group.refresh_automatic_groups!
render json: "ok" render json: success_json
end end
def users def users
@ -22,7 +22,7 @@ class Admin::GroupsController < Admin::AdminController
group.usernames = params[:group][:usernames] group.usernames = params[:group][:usernames]
group.name = params[:group][:name] if params[:group][:name] group.name = params[:group][:name] if params[:group][:name]
if group.save if group.save
render json: "ok" render json: success_json
else else
render_json_error group render_json_error group
end end