IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate success and error in Discourse.ajax

Browse Source
This commit is contained in:
Robin Ward
2013-05-07 11:15:28 -04:00
parent 6cbcd6e4a6
commit 0b4fc5d81c
17 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,7 @@ Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Pres
this.set('sentTestEmail', false);
var adminEmailLogsController = this;
Discourse.ajax({
url: Discourse.getURL("/admin/email_logs/test"),
Discourse.ajax(Discourse.getURL("/admin/email_logs/test"), {
type: 'POST',
data: { email_address: this.get('testEmailAddress') }
}).then(function () {

16
app/assets/javascripts/admin/controllers/admin_users_list_controller.js
View File

@@ -1,11 +1,11 @@
/**
This controller supports the interface for listing users in the admin section.
@class AdminUsersListController
@class AdminUsersListController
@extends Ember.ArrayController
@namespace Discourse
@module Discourse
**/
**/
Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Presence, {
username: null,
query: null,
@@ -88,9 +88,13 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@method refreshUsers
**/
refreshUsers: function() {
this.set('loading', true);
var _this = this;
this.set('content', Discourse.AdminUser.findAll(this.get('query'), this.get('username'), function() { _this.set('loading', false); }));
var adminUsersListController = this;
adminUsersListController.set('loading', true);
Discourse.AdminUser.findAll(this.get('query'), this.get('username')).then(function (result) {
adminUsersListController.set('content', result);
adminUsersListController.set('loading', false);
})
},
@@ -115,5 +119,5 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
approveUsers: function() {
Discourse.AdminUser.bulkApprove(this.get('content').filterProperty('selected'));
}
});

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

@@ -20,6 +20,6 @@ Discourse.AdminApi = Discourse.Model.extend({
Discourse.AdminApi.reopenClass({
find: function() {
return this.getModelAjax('/admin/api');
return this.getModelAjax(Discourse.getURL('/admin/api'));
}
});

5
app/assets/javascripts/admin/models/admin_dashboard.js
View File

@@ -19,10 +19,7 @@ Discourse.AdminDashboard.reopenClass({
@return {jqXHR} a jQuery Promise object
**/
find: function() {
return Discourse.ajax(Discourse.getURL("/admin/dashboard"), {
type: 'GET',
dataType: 'json'
}).then(function(json) {
return Discourse.ajax(Discourse.getURL("/admin/dashboard")).then(function(json) {
var model = Discourse.AdminDashboard.create(json);
model.set('loaded', true);
return model;

14
app/assets/javascripts/admin/models/admin_user.js
View File

@@ -191,22 +191,18 @@ Discourse.AdminUser.reopenClass({
},
find: function(username) {
return Discourse.ajax({url: Discourse.getURL("/admin/users/") + username}).then(function (result) {
return Discourse.ajax(Discourse.getURL("/admin/users/") + username).then(function (result) {
return Discourse.AdminUser.create(result);
});
},
findAll: function(query, filter, doneCallback) {
var result = Em.A();
Discourse.ajax({
url: Discourse.getURL("/admin/users/list/") + query + ".json",
findAll: function(query, filter) {
return Discourse.ajax(Discourse.getURL("/admin/users/list/") + query + ".json", {
data: { filter: filter }
}).then(function(users) {
users.each(function(u) {
result.pushObject(Discourse.AdminUser.create(u));
return users.map(function(u) {
return Discourse.AdminUser.create(u);
});
if( doneCallback ) { doneCallback(); }
});
return result;
}
});

3
app/assets/javascripts/admin/models/email_log.js
View File

@@ -18,8 +18,7 @@ Discourse.EmailLog.reopenClass({
findAll: function(filter) {
var result = Em.A();
Discourse.ajax({
url: Discourse.getURL("/admin/email_logs.json"),
Discourse.ajax(Discourse.getURL("/admin/email_logs.json"), {
data: { filter: filter }
}).then(function(logs) {
logs.each(function(log) {

11
app/assets/javascripts/admin/models/site_customization.js
View File

@@ -66,8 +66,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
};
var siteCustomization = this;
return Discourse.ajax({
url: Discourse.getURL("/admin/site_customizations") + (this.id ? '/' + this.id : ''),
return Discourse.ajax(Discourse.getURL("/admin/site_customizations") + (this.id ? '/' + this.id : ''), {
data: { site_customization: data },
type: this.id ? 'PUT' : 'POST'
}).then(function (result) {
@@ -81,8 +80,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
destroy: function() {
if(!this.id) return;
return Discourse.ajax({
url: Discourse.getURL("/admin/site_customizations/") + this.id,
return Discourse.ajax(Discourse.getURL("/admin/site_customizations/") + this.id, {
type: 'DELETE'
});
}
@@ -101,10 +99,7 @@ var SiteCustomizations = Ember.ArrayProxy.extend({
Discourse.SiteCustomization.reopenClass({
findAll: function() {
var customizations = SiteCustomizations.create({ content: [], loading: true });
Discourse.ajax({
url: Discourse.getURL("/admin/site_customizations"),
dataType: "json"
}).then(function (data) {
Discourse.ajax(Discourse.getURL("/admin/site_customizations")).then(function (data) {
if (data) {
data.site_customizations.each(function(c) {
customizations.pushObject(Discourse.SiteCustomization.create(c.site_customizations));

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

@@ -90,7 +90,7 @@ Discourse.SiteSetting.reopenClass({
**/
findAll: function() {
var result = Em.A();
Discourse.ajax({url: Discourse.getURL("/admin/site_settings")}).then(function (settings) {
Discourse.ajax(Discourse.getURL("/admin/site_settings")).then(function (settings) {
settings.site_settings.each(function(s) {
s.originalValue = s.value;
result.pushObject(Discourse.SiteSetting.create(s));

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

@@ -26,7 +26,7 @@ Discourse.VersionCheck = Discourse.Model.extend({
Discourse.VersionCheck.reopenClass({
find: function() {
return Discourse.ajax({ url: Discourse.getURL('/admin/version_check'), dataType: 'json' }).then(function(json) {
return Discourse.ajax(Discourse.getURL('/admin/version_check')).then(function(json) {
return Discourse.VersionCheck.create(json);
});
}