github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 09:17:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Return a promise from Discourse.Group.findAll()

Browse Source
This commit is contained in:
Robin Ward 2014-02-06 14:37:08 -05:00
parent 003eb06807
commit bd0c2a74fc
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
Discourse.AdminGroupsController = Ember.Controller.extend({
itemController: 'adminGroup',
aliasLevels: null,
actions: {
edit: function(group){
@ -13,8 +12,10 @@ Discourse.AdminGroupsController = Ember.Controller.extend({
self.set('refreshingAutoGroups', true);
Discourse.ajax('/admin/groups/refresh_automatic_groups', {type: 'POST'}).then(function() {
self.set('model', Discourse.Group.findAll());
self.set('refreshingAutoGroups', false);
return Discourse.Group.findAll().then(function(groups) {
self.set('model', groups);
self.set('refreshingAutoGroups', false);
});
});
},

8
app/assets/javascripts/discourse/models/group.js
View File

@ -122,15 +122,13 @@ Discourse.Group = Discourse.Model.extend({
Discourse.Group.reopenClass({
findAll: function(){
var list = Discourse.SelectableArray.create();
Discourse.ajax("/admin/groups.json").then(function(groups){
return Discourse.ajax("/admin/groups.json").then(function(groups){
var list = Discourse.SelectableArray.create();
_.each(groups,function(group){
list.addObject(Discourse.Group.create(group));
});
return list;
});
return list;
},
aliasLevelOptions: function() {