{{#if content.approved}}
{{i18n admin.user.approved_by}}
-
{{avatar approved_by imageSize="small"}}
-
{{content.approved_by.username}}
+
+ {{#linkTo 'adminUser' content.approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}}
+ {{#linkTo 'adminUser' content.approved_by}}{{content.approved_by.username}}{{/linkTo}}
{{else}}
{{i18n no_value}}
{{/if}}
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 06874cbf50..f38da4df60 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -56,10 +56,8 @@
{{/if}}
{{/if}}
-
- {{avatar this imageSize="small"}}
- |
-
{{unbound username}} |
+
{{#linkTo 'adminUser' this}}{{avatar this imageSize="small"}}{{/linkTo}} |
+
{{#linkTo 'adminUser' this}}{{unbound username}}{{/linkTo}} |
{{shorten email}} |
{{{unbound last_emailed_age}}} |
{{{unbound last_seen_age}}} |
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index e6d34452f7..1ac656daa1 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -23,6 +23,10 @@ Discourse = Ember.Application.createWithMixins({
highestSeenByTopic: {},
getURL: function(url) {
+
+ // If it's a non relative URL, return it.
+ if (url.indexOf('http') === 0) return url;
+
var u = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
if (u[u.length-1] === '/') {
u = u.substring(0, u.length-1);
@@ -173,7 +177,7 @@ Discourse = Ember.Application.createWithMixins({
**/
logout: function() {
Discourse.KeyValueStore.abandonLocal();
- Discourse.ajax(Discourse.getURL("/session/") + this.get('currentUser.username'), {
+ Discourse.ajax("/session/" + this.get('currentUser.username'), {
type: 'DELETE'
}).then(function() {
// Reloading will refresh unbound properties
@@ -189,7 +193,8 @@ Discourse = Ember.Application.createWithMixins({
/**
Our own $.ajax method. Makes sure the .then method executes in an Ember runloop
- for performance reasons.
+ for performance reasons. Also automatically adjusts the URL to support installs
+ in subfolders.
@method ajax
**/
@@ -211,13 +216,27 @@ Discourse = Ember.Application.createWithMixins({
}
if (args.success) {
- console.log("DEPRECATION: Discourse.ajax should use promises, received 'success' callback");
+ console.warning("DEPRECATION: Discourse.ajax should use promises, received 'success' callback");
}
if (args.error) {
- console.log("DEPRECATION: Discourse.ajax should use promises, received 'error' callback");
+ console.warning("DEPRECATION: Discourse.ajax should use promises, received 'error' callback");
}
- return $.ajax(url, args);
+ return Ember.Deferred.promise(function (promise) {
+ var oldSuccess = args.success;
+ args.success = function(xhr) {
+ Ember.run(promise, promise.resolve, xhr);
+ if (oldSuccess) oldSuccess(xhr);
+ }
+
+ var oldError = args.error;
+ args.error = function(xhr) {
+ promise.reject(xhr);
+ if (oldError) oldError(xhr);
+ }
+
+ $.ajax(Discourse.getURL(url), args);
+ });
},
/**
diff --git a/app/assets/javascripts/discourse/components/click_track.js b/app/assets/javascripts/discourse/components/click_track.js
index 45ca15827a..40c60382c6 100644
--- a/app/assets/javascripts/discourse/components/click_track.js
+++ b/app/assets/javascripts/discourse/components/click_track.js
@@ -72,7 +72,7 @@ Discourse.ClickTrack = {
// if they want to open in a new tab, do an AJAX request
if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) {
- Discourse.ajax(Discourse.getURL("/clicks/track"), {
+ Discourse.ajax("/clicks/track", {
data: {
url: href,
post_id: postId,
@@ -86,7 +86,7 @@ Discourse.ClickTrack = {
// If we're on the same site, use the router and track via AJAX
if (href.indexOf(Discourse.URL.origin()) === 0) {
- Discourse.ajax(Discourse.getURL("/clicks/track"), {
+ Discourse.ajax("/clicks/track", {
data: {
url: href,
post_id: postId,
diff --git a/app/assets/javascripts/discourse/components/mention.js b/app/assets/javascripts/discourse/components/mention.js
index 5df176e7e2..bc8b6edc83 100644
--- a/app/assets/javascripts/discourse/components/mention.js
+++ b/app/assets/javascripts/discourse/components/mention.js
@@ -22,7 +22,7 @@ Discourse.Mention = (function() {
callback(cached);
return false;
} else {
- Discourse.ajax(Discourse.getURL("/users/is_local_username"), { data: { username: name } }).then(function(r) {
+ Discourse.ajax("/users/is_local_username", { data: { username: name } }).then(function(r) {
cache(name, r.valid);
callback(r.valid);
});
diff --git a/app/assets/javascripts/discourse/components/onebox.js b/app/assets/javascripts/discourse/components/onebox.js
index 5d90f92c53..eb7a1bf7b7 100644
--- a/app/assets/javascripts/discourse/components/onebox.js
+++ b/app/assets/javascripts/discourse/components/onebox.js
@@ -49,9 +49,7 @@ Discourse.Onebox = {
$elem.addClass('loading-onebox');
// Retrieve the onebox
- var promise = Discourse.ajax(Discourse.getURL("/onebox"), {
- data: { url: url, refresh: refresh }
- });
+ var promise = Discourse.ajax("/onebox", { data: { url: url, refresh: refresh } });
// We can call this when loading is complete
var loadingFinished = function() {
diff --git a/app/assets/javascripts/discourse/components/screen_track.js b/app/assets/javascripts/discourse/components/screen_track.js
index 8a26795772..7efdd5376c 100644
--- a/app/assets/javascripts/discourse/components/screen_track.js
+++ b/app/assets/javascripts/discourse/components/screen_track.js
@@ -98,7 +98,7 @@ Discourse.ScreenTrack = Ember.Object.extend({
highestSeenByTopic[topicId] = highestSeen;
}
if (!Object.isEmpty(newTimings)) {
- Discourse.ajax(Discourse.getURL('/topics/timings'), {
+ Discourse.ajax('/topics/timings', {
data: {
timings: newTimings,
topic_time: this.topicTime,
diff --git a/app/assets/javascripts/discourse/components/url.js b/app/assets/javascripts/discourse/components/url.js
index 917a929c9b..08869b6770 100644
--- a/app/assets/javascripts/discourse/components/url.js
+++ b/app/assets/javascripts/discourse/components/url.js
@@ -128,7 +128,7 @@ Discourse.URL = {
@method redirectTo
**/
redirectTo: function(url) {
- window.location = url;
+ window.location = Discourse.getURL(url);
}
};
diff --git a/app/assets/javascripts/discourse/components/user_search.js b/app/assets/javascripts/discourse/components/user_search.js
index dbd5b8dbc5..8b827f9551 100644
--- a/app/assets/javascripts/discourse/components/user_search.js
+++ b/app/assets/javascripts/discourse/components/user_search.js
@@ -10,7 +10,7 @@ var cacheTopicId = null;
var cacheTime = null;
var debouncedSearch = Discourse.debouncePromise(function(term, topicId) {
- return Discourse.ajax(Discourse.getURL('/users/search/users'), {
+ return Discourse.ajax('/users/search/users', {
data: {
term: term,
topic_id: topicId
diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js
index 8ea65b2c26..8cce203e6e 100644
--- a/app/assets/javascripts/discourse/components/utilities.js
+++ b/app/assets/javascripts/discourse/components/utilities.js
@@ -44,15 +44,10 @@ Discourse.Utilities = {
},
avatarUrl: function(username, size, template) {
- var rawSize;
- if (!username) {
- return "";
- }
+ if (!username) return "";
size = Discourse.Utilities.translateSize(size);
- rawSize = (size * (window.devicePixelRatio || 1)).toFixed();
- if (template) {
- return template.replace(/\{size\}/g, rawSize);
- }
+ var rawSize = (size * (window.devicePixelRatio || 1)).toFixed();
+ if (template) return template.replace(/\{size\}/g, rawSize);
return Discourse.getURL("/users/") + (username.toLowerCase()) + "/avatar/" + rawSize + "?__ws=" + (encodeURIComponent(Discourse.BaseUrl || ""));
},
@@ -71,8 +66,7 @@ Discourse.Utilities = {
},
postUrl: function(slug, topicId, postNumber) {
- var url;
- url = Discourse.getURL("/t/");
+ var url = Discourse.getURL("/t/");
if (slug) {
url += slug + "/";
} else {
diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index ca21a5ed63..f85a6f5d0f 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -132,7 +132,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
// If visible update the text
var educationKey = this.get('content.creatingTopic') ? 'new-topic' : 'new-reply';
var composerController = this;
- Discourse.ajax(Discourse.getURL("/education/") + educationKey).then(function(result) {
+ Discourse.ajax("/education/" + educationKey).then(function(result) {
composerController.set('educationContents', result);
});
}.observes('typedReply', 'content.creatingTopic', 'Discourse.currentUser.reply_count'),
diff --git a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
index d67319581b..1f325a19b7 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
@@ -29,16 +29,16 @@ Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({
if( this.get('newUsername') && this.get('newUsername').length < 3 ) {
this.set('errorMessage', Em.String.i18n('user.name.too_short'));
} else {
- var _this = this;
+ var preferencesUsernameController = this;
this.set('taken', false);
this.set('errorMessage', null);
if (this.blank('newUsername')) return;
if (this.get('unchanged')) return;
Discourse.User.checkUsername(this.get('newUsername')).then(function(result) {
if (result.errors) {
- return _this.set('errorMessage', result.errors.join(' '));
+ preferencesUsernameController.set('errorMessage', result.errors.join(' '));
} else if (result.available === false) {
- return _this.set('taken', true);
+ preferencesUsernameController.set('taken', true);
}
});
}
@@ -50,17 +50,16 @@ Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({
}).property('saving'),
changeUsername: function() {
- var _this = this;
+ var preferencesUsernameController = this;
return bootbox.confirm(Em.String.i18n("user.change_username.confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
if (result) {
- _this.set('saving', true);
- return _this.get('content').changeUsername(_this.get('newUsername')).then(function() {
- var url = Discourse.getURL("/users/") + _this.get('newUsername').toLowerCase() + "/preferences";
- Discourse.URL.redirectTo(url);
+ preferencesUsernameController.set('saving', true);
+ preferencesUsernameController.get('content').changeUsername(preferencesUsernameController.get('newUsername')).then(function() {
+ Discourse.URL.redirectTo("/users/" + preferencesUsernameController.get('newUsername').toLowerCase() + "/preferences");
}, function() {
// error
- _this.set('error', true);
- _this.set('saving', false);
+ preferencesUsernameController.set('error', true);
+ preferencesUsernameController.set('saving', false);
});
}
});
diff --git a/app/assets/javascripts/discourse/controllers/static_controller.js b/app/assets/javascripts/discourse/controllers/static_controller.js
index 3eb985d727..4afc96ead8 100644
--- a/app/assets/javascripts/discourse/controllers/static_controller.js
+++ b/app/assets/javascripts/discourse/controllers/static_controller.js
@@ -20,7 +20,7 @@ Discourse.StaticController = Discourse.Controller.extend({
text = text[1];
this.set('content', text);
} else {
- return Discourse.ajax(Discourse.getURL(path + ".json")).then(function (result) {
+ return Discourse.ajax(path + ".json").then(function (result) {
staticController.set('content', result);
});
}
diff --git a/app/assets/javascripts/discourse/models/action_summary.js b/app/assets/javascripts/discourse/models/action_summary.js
index 87ce47f2cb..1b48028db9 100644
--- a/app/assets/javascripts/discourse/models/action_summary.js
+++ b/app/assets/javascripts/discourse/models/action_summary.js
@@ -58,7 +58,7 @@ Discourse.ActionSummary = Discourse.Model.extend({
// Create our post action
var actionSummary = this;
- return Discourse.ajax(Discourse.getURL("/post_actions"), {
+ return Discourse.ajax("/post_actions", {
type: 'POST',
data: {
id: this.get('post.id'),
@@ -77,7 +77,7 @@ Discourse.ActionSummary = Discourse.Model.extend({
this.removeAction();
// Remove our post action
- return Discourse.ajax(Discourse.getURL("/post_actions/") + (this.get('post.id')), {
+ return Discourse.ajax("/post_actions/" + (this.get('post.id')), {
type: 'DELETE',
data: {
post_action_type_id: this.get('id')
@@ -87,7 +87,7 @@ Discourse.ActionSummary = Discourse.Model.extend({
clearFlags: function() {
var actionSummary = this;
- return Discourse.ajax(Discourse.getURL("/post_actions/clear_flags"), {
+ return Discourse.ajax("/post_actions/clear_flags", {
type: "POST",
data: {
post_action_type_id: this.get('id'),
@@ -101,7 +101,7 @@ Discourse.ActionSummary = Discourse.Model.extend({
loadUsers: function() {
var actionSummary = this;
- Discourse.ajax(Discourse.getURL("/post_actions/users"), {
+ Discourse.ajax("/post_actions/users", {
data: {
id: this.get('post.id'),
post_action_type_id: this.get('id')
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index e8f6246cad..7a87073919 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -30,9 +30,9 @@ Discourse.Category = Discourse.Model.extend({
}.property('topic_count'),
save: function(args) {
- var url = Discourse.getURL("/categories");
+ var url = "/categories";
if (this.get('id')) {
- url = Discourse.getURL("/categories/") + (this.get('id'));
+ url = "/categories/" + (this.get('id'));
}
return Discourse.ajax(url, {
@@ -47,14 +47,14 @@ Discourse.Category = Discourse.Model.extend({
},
destroy: function(callback) {
- return Discourse.ajax(Discourse.getURL("/categories/") + (this.get('slug') || this.get('id')), { type: 'DELETE' });
+ return Discourse.ajax("/categories/" + (this.get('slug') || this.get('id')), { type: 'DELETE' });
}
});
Discourse.Category.reopenClass({
findBySlugOrId: function(slugOrId) {
- return Discourse.ajax(Discourse.getURL("/categories/") + slugOrId + ".json").then(function (result) {
+ return Discourse.ajax("/categories/" + slugOrId + ".json").then(function (result) {
return Discourse.Category.create(result.category);
});
}
diff --git a/app/assets/javascripts/discourse/models/category_list.js b/app/assets/javascripts/discourse/models/category_list.js
index 23dc00ffb5..b5ab4177dd 100644
--- a/app/assets/javascripts/discourse/models/category_list.js
+++ b/app/assets/javascripts/discourse/models/category_list.js
@@ -33,7 +33,7 @@ Discourse.CategoryList.reopenClass({
list: function(filter) {
var route = this;
- return Discourse.ajax(Discourse.getURL("/") + filter + ".json").then(function(result) {
+ return Discourse.ajax("/" + filter + ".json").then(function(result) {
var categoryList = Discourse.TopicList.create();
categoryList.set('can_create_category', result.category_list.can_create_category);
categoryList.set('categories', route.categoriesFrom(result));
diff --git a/app/assets/javascripts/discourse/models/draft.js b/app/assets/javascripts/discourse/models/draft.js
index 1e8708e994..110eab62d5 100644
--- a/app/assets/javascripts/discourse/models/draft.js
+++ b/app/assets/javascripts/discourse/models/draft.js
@@ -11,7 +11,7 @@ Discourse.Draft = Discourse.Model.extend({});
Discourse.Draft.reopenClass({
clear: function(key, sequence) {
- return Discourse.ajax(Discourse.getURL("/draft"), {
+ return Discourse.ajax("/draft", {
type: 'DELETE',
data: {
draft_key: key,
@@ -21,7 +21,7 @@ Discourse.Draft.reopenClass({
},
get: function(key) {
- return Discourse.ajax(Discourse.getURL('/draft'), {
+ return Discourse.ajax('/draft', {
data: { draft_key: key },
dataType: 'json'
});
@@ -34,7 +34,7 @@ Discourse.Draft.reopenClass({
save: function(key, sequence, data) {
data = typeof data === "string" ? data : JSON.stringify(data);
- return Discourse.ajax(Discourse.getURL("/draft"), {
+ return Discourse.ajax("/draft", {
type: 'POST',
data: {
draft_key: key,
diff --git a/app/assets/javascripts/discourse/models/invite.js b/app/assets/javascripts/discourse/models/invite.js
index fadfe40771..52ed84f913 100644
--- a/app/assets/javascripts/discourse/models/invite.js
+++ b/app/assets/javascripts/discourse/models/invite.js
@@ -10,7 +10,7 @@
Discourse.Invite = Discourse.Model.extend({
rescind: function() {
- Discourse.ajax(Discourse.getURL('/invites'), {
+ Discourse.ajax('/invites', {
type: 'DELETE',
data: { email: this.get('email') }
});
diff --git a/app/assets/javascripts/discourse/models/invite_list.js b/app/assets/javascripts/discourse/models/invite_list.js
index 7fe83ca798..43376f998a 100644
--- a/app/assets/javascripts/discourse/models/invite_list.js
+++ b/app/assets/javascripts/discourse/models/invite_list.js
@@ -15,7 +15,7 @@ Discourse.InviteList = Discourse.Model.extend({
Discourse.InviteList.reopenClass({
findInvitedBy: function(user) {
- return Discourse.ajax({ url: Discourse.getURL("/users/") + (user.get('username_lower')) + "/invited.json" }).then(function (result) {
+ return Discourse.ajax("/users/" + (user.get('username_lower')) + "/invited.json").then(function (result) {
var invitedList = result.invited_list;
if (invitedList.pending) {
invitedList.pending = invitedList.pending.map(function(i) {
diff --git a/app/assets/javascripts/discourse/models/model.js b/app/assets/javascripts/discourse/models/model.js
index f72ece0dc5..8750ee2b39 100644
--- a/app/assets/javascripts/discourse/models/model.js
+++ b/app/assets/javascripts/discourse/models/model.js
@@ -39,17 +39,6 @@ Discourse.Model = Ember.Object.extend(Discourse.Presence, {
Discourse.Model.reopenClass({
- /**
- $.get shortcut that uses Discourse.Url and returns a promise
- **/
- getModelAjax: function(url) {
- var modelClass = this;
- return Discourse.ajax(url, { cache: false }).then(function (result) {
- return modelClass.create(result);
- });
- },
-
-
/**
Given an array of values, return them in a hash
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
index 234932f8f9..d9ac55fb69 100755
--- a/app/assets/javascripts/discourse/models/post.js
+++ b/app/assets/javascripts/discourse/models/post.js
@@ -8,7 +8,7 @@
**/
Discourse.Post = Discourse.Model.extend({
- shareUrl: function(){
+ shareUrl: function() {
var user = Discourse.get('currentUser');
if (this.get('postnumber') === 1){
return this.get('topic.url');
@@ -17,9 +17,9 @@ Discourse.Post = Discourse.Model.extend({
}
}.property('url'),
- new_user:(function(){
+ new_user: function() {
return this.get('trust_level') === 0;
- }).property('trust_level'),
+ }.property('trust_level'),
url: function() {
return Discourse.Utilities.postUrl(this.get('topic.slug') || this.get('topic_slug'), this.get('topic_id'), this.get('post_number'));
@@ -29,34 +29,34 @@ Discourse.Post = Discourse.Model.extend({
return Discourse.getURL("/t/") + (this.get('topic_id')) + "/" + (this.get('reply_to_post_number'));
}.property('reply_to_post_number'),
- usernameUrl: (function() {
+ usernameUrl: function() {
return Discourse.getURL("/users/" + this.get('username'));
- }).property('username'),
+ }.property('username'),
- showUserReplyTab: (function() {
+ showUserReplyTab: function() {
return this.get('reply_to_user') && (this.get('reply_to_post_number') < (this.get('post_number') - 1));
- }).property('reply_to_user', 'reply_to_post_number', 'post_number'),
+ }.property('reply_to_user', 'reply_to_post_number', 'post_number'),
- firstPost: (function() {
+ firstPost: function() {
if (this.get('bestOfFirst') === true) return true;
return this.get('post_number') === 1;
- }).property('post_number'),
+ }.property('post_number'),
byTopicCreator: function() {
return this.get('topic.created_by.id') === this.get('user_id');
}.property('topic.created_by.id', 'user_id'),
- hasHistory: (function() {
+ hasHistory: function() {
return this.get('version') > 1;
- }).property('version'),
+ }.property('version'),
- postElementId: (function() {
+ postElementId: function() {
return "post_" + (this.get('post_number'));
- }).property(),
+ }.property(),
// The class for the read icon of the post. It starts with read-icon then adds 'seen' or
// 'last-read' if the post has been seen or is the highest post number seen so far respectively.
- bookmarkClass: (function() {
+ bookmarkClass: function() {
var result, topic;
result = 'read-icon';
if (this.get('bookmarked')) return result + ' bookmarked';
@@ -69,7 +69,7 @@ Discourse.Post = Discourse.Model.extend({
}
}
return result;
- }).property('read', 'topic.last_read_post_number', 'bookmarked'),
+ }.property('read', 'topic.last_read_post_number', 'bookmarked'),
// Custom tooltips for the bookmark icons
bookmarkTooltip: (function() {
@@ -85,13 +85,12 @@ Discourse.Post = Discourse.Model.extend({
bookmarkedChanged: function() {
var post = this;
- Discourse.ajax({
- url: Discourse.getURL("/posts/") + (this.get('id')) + "/bookmark",
+ Discourse.ajax("/posts/" + (this.get('id')) + "/bookmark", {
type: 'PUT',
data: {
bookmarked: this.get('bookmarked') ? true : false
}
- }).fail(function (error) {
+ }).then(null, function (error) {
if (error && error.responseText) {
bootbox.alert($.parseJSON(error.responseText).errors[0]);
} else {
@@ -101,17 +100,17 @@ Discourse.Post = Discourse.Model.extend({
}.observes('bookmarked'),
- internalLinks: (function() {
+ internalLinks: function() {
if (this.blank('link_counts')) return null;
return this.get('link_counts').filterProperty('internal').filterProperty('title');
- }).property('link_counts.@each.internal'),
+ }.property('link_counts.@each.internal'),
// Edits are the version - 1, so version 2 = 1 edit
- editCount: (function() {
+ editCount: function() {
return this.get('version') - 1;
- }).property('version'),
+ }.property('version'),
- historyHeat: (function() {
+ historyHeat: function() {
var rightNow, updatedAt, updatedAtDate;
if (!(updatedAt = this.get('updated_at'))) return;
rightNow = new Date().getTime();
@@ -121,17 +120,17 @@ Discourse.Post = Discourse.Model.extend({
if (updatedAtDate > (rightNow - 60 * 60 * 1000 * 12)) return 'heatmap-high';
if (updatedAtDate > (rightNow - 60 * 60 * 1000 * 24)) return 'heatmap-med';
if (updatedAtDate > (rightNow - 60 * 60 * 1000 * 48)) return 'heatmap-low';
- }).property('updated_at'),
+ }.property('updated_at'),
- flagsAvailable: (function() {
+ flagsAvailable: function() {
var _this = this;
var flags = Discourse.get('site.flagTypes').filter(function(item) {
return _this.get("actionByName." + (item.get('name_key')) + ".can_act");
});
return flags;
- }).property('Discourse.site.flagTypes', 'actions_summary.@each.can_act'),
+ }.property('Discourse.site.flagTypes', 'actions_summary.@each.can_act'),
- actionsHistory: (function() {
+ actionsHistory: function() {
if (!this.present('actions_summary')) return null;
return this.get('actions_summary').filter(function(i) {
@@ -139,15 +138,14 @@ Discourse.Post = Discourse.Model.extend({
if (i.get('users') && i.get('users').length > 0) return true;
return !i.get('hidden');
});
- }).property('actions_summary.@each.users', 'actions_summary.@each.count'),
+ }.property('actions_summary.@each.users', 'actions_summary.@each.count'),
// Save a post and call the callback when done.
save: function(complete, error) {
var data, metaData;
if (!this.get('newPost')) {
// We're updating a post
- return Discourse.ajax({
- url: Discourse.getURL("/posts/") + (this.get('id')),
+ return Discourse.ajax("/posts/" + (this.get('id')), {
type: 'PUT',
data: {
post: { raw: this.get('raw') },
@@ -178,9 +176,8 @@ Discourse.Post = Discourse.Model.extend({
data.meta_data = {};
Ember.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); });
}
- return Discourse.ajax({
+ return Discourse.ajax("/posts", {
type: 'POST',
- url: Discourse.getURL("/posts"),
data: data
}).then(function(result) {
// Post created
@@ -193,11 +190,11 @@ Discourse.Post = Discourse.Model.extend({
},
recover: function() {
- return Discourse.ajax(Discourse.getURL("/posts/") + (this.get('id')) + "/recover", { type: 'PUT', cache: false });
+ return Discourse.ajax("/posts/" + (this.get('id')) + "/recover", { type: 'PUT', cache: false });
},
destroy: function(complete) {
- return Discourse.ajax(Discourse.getURL("/posts/") + (this.get('id')), { type: 'DELETE' });
+ return Discourse.ajax("/posts/" + (this.get('id')), { type: 'DELETE' });
},
// Update the properties of this post from an obj, ignoring cooked as we should already
@@ -237,7 +234,7 @@ Discourse.Post = Discourse.Model.extend({
this.set('replies', []);
var parent = this;
- return Discourse.ajax({url: Discourse.getURL("/posts/") + (this.get('id')) + "/replies"}).then(function(loaded) {
+ return Discourse.ajax("/posts/" + (this.get('id')) + "/replies").then(function(loaded) {
var replies = parent.get('replies');
loaded.each(function(reply) {
var post = Discourse.Post.create(reply);
@@ -249,7 +246,7 @@ Discourse.Post = Discourse.Model.extend({
},
loadVersions: function() {
- return Discourse.ajax(Discourse.getURL("/posts/") + (this.get('id')) + "/versions.json");
+ return Discourse.ajax("/posts/" + (this.get('id')) + "/versions.json");
},
// Whether to show replies directly below
@@ -303,7 +300,7 @@ Discourse.Post.reopenClass({
},
deleteMany: function(posts) {
- return Discourse.ajax(Discourse.getURL("/posts/destroy_many"), {
+ return Discourse.ajax("/posts/destroy_many", {
type: 'DELETE',
data: {
post_ids: posts.map(function(p) { return p.get('id'); })
@@ -312,26 +309,26 @@ Discourse.Post.reopenClass({
},
loadVersion: function(postId, version, callback) {
- return Discourse.ajax({url: Discourse.getURL("/posts/") + postId + ".json?version=" + version}).then(function(result) {
+ return Discourse.ajax("/posts/" + postId + ".json?version=" + version).then(function(result) {
return Discourse.Post.create(result);
});
},
loadByPostNumber: function(topicId, postId) {
- return Discourse.ajax({url: Discourse.getURL("/posts/by_number/") + topicId + "/" + postId + ".json"}).then(function (result) {
+ return Discourse.ajax("/posts/by_number/" + topicId + "/" + postId + ".json").then(function (result) {
return Discourse.Post.create(result);
});
},
loadQuote: function(postId) {
- return Discourse.ajax({url: Discourse.getURL("/posts/") + postId + ".json"}).then(function(result) {
+ return Discourse.ajax("/posts/" + postId + ".json").then(function(result) {
var post = Discourse.Post.create(result);
return Discourse.BBCode.buildQuoteBBCode(post, post.get('raw'));
});
},
load: function(postId) {
- return Discourse.ajax({url: Discourse.getURL("/posts/") + postId + ".json"}).then(function (result) {
+ return Discourse.ajax("/posts/" + postId + ".json").then(function (result) {
return Discourse.Post.create(result);
});
}
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index e96b5cf5f9..79fab6f6dd 100755
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -161,7 +161,7 @@ Discourse.Topic = Discourse.Model.extend({
url: "" + (this.get('url')) + "/star",
type: 'PUT',
data: { starred: topic.get('starred') ? true : false }
- }).fail(function (error) {
+ }).then(null, function (error) {
topic.toggleProperty('starred');
if (error && error.responseText) {
@@ -185,25 +185,22 @@ Discourse.Topic = Discourse.Model.extend({
// Reset our read data for this topic
resetRead: function() {
- return Discourse.ajax(Discourse.getURL("/t/") + (this.get('id')) + "/timings", {
+ return Discourse.ajax("/t/" + (this.get('id')) + "/timings", {
type: 'DELETE'
});
},
// Invite a user to this topic
inviteUser: function(user) {
- return Discourse.ajax({
+ return Discourse.ajax("/t/" + (this.get('id')) + "/invite", {
type: 'POST',
- url: Discourse.getURL("/t/") + (this.get('id')) + "/invite",
- data: {
- user: user
- }
+ data: { user: user }
});
},
// Delete this topic
destroy: function() {
- return Discourse.ajax(Discourse.getURL("/t/") + (this.get('id')), { type: 'DELETE' });
+ return Discourse.ajax("/t/" + (this.get('id')), { type: 'DELETE' });
},
// Load the posts for this topic
@@ -315,12 +312,9 @@ Discourse.Topic = Discourse.Model.extend({
updateNotifications: function(v) {
this.set('notification_level', v);
this.set('notifications_reason_id', null);
- return Discourse.ajax({
- url: Discourse.getURL("/t/") + (this.get('id')) + "/notifications",
+ return Discourse.ajax("/t/" + (this.get('id')) + "/notifications", {
type: 'POST',
- data: {
- notification_level: v
- }
+ data: { notification_level: v }
});
},
@@ -351,9 +345,9 @@ Discourse.Topic = Discourse.Model.extend({
// Clear the pin optimistically from the object
topic.set('pinned', false);
- Discourse.ajax(Discourse.getURL("/t/") + this.get('id') + "/clear-pin", {
+ Discourse.ajax("/t/" + this.get('id') + "/clear-pin", {
type: 'PUT'
- }).fail(function() {
+ }).then(null, function() {
// On error, put the pin back
topic.set('pinned', true);
});
@@ -403,7 +397,7 @@ Discourse.Topic.reopenClass({
@returns A promise that will resolve to the topics
**/
findSimilarTo: function(title, body) {
- return Discourse.ajax({url: Discourse.getURL("/topics/similar_to"), data: {title: title, raw: body} }).then(function (results) {
+ return Discourse.ajax("/topics/similar_to", { data: {title: title, raw: body} }).then(function (results) {
return results.map(function(topic) { return Discourse.Topic.create(topic) });
});
},
@@ -457,7 +451,7 @@ Discourse.Topic.reopenClass({
// Create a topic from posts
movePosts: function(topicId, title, postIds) {
- return Discourse.ajax(Discourse.getURL(Discourse.getURL("/t/")) + topicId + "/move-posts", {
+ return Discourse.ajax("/t/" + topicId + "/move-posts", {
type: 'POST',
data: { title: title, post_ids: postIds }
});
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 35434b24f3..9fa45098f7 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -61,9 +61,9 @@ Discourse.User = Discourse.Model.extend({
@property path
@type {String}
**/
- path: (function() {
+ path: function() {
return Discourse.getURL("/users/") + (this.get('username_lower'));
- }).property('username'),
+ }.property('username'),
/**
Path to this user's administration
@@ -71,9 +71,9 @@ Discourse.User = Discourse.Model.extend({
@property adminPath
@type {String}
**/
- adminPath: (function() {
+ adminPath: function() {
return Discourse.getURL("/admin/users/") + (this.get('username_lower'));
- }).property('username'),
+ }.property('username'),
/**
This user's username in lowercase.
@@ -81,9 +81,9 @@ Discourse.User = Discourse.Model.extend({
@property username_lower
@type {String}
**/
- username_lower: (function() {
+ username_lower: function() {
return this.get('username').toLowerCase();
- }).property('username'),
+ }.property('username'),
/**
This user's trust level.
@@ -91,9 +91,9 @@ Discourse.User = Discourse.Model.extend({
@property trustLevel
@type {Integer}
**/
- trustLevel: (function() {
+ trustLevel: function() {
return Discourse.get('site.trust_levels').findProperty('id', this.get('trust_level'));
- }).property('trust_level'),
+ }.property('trust_level'),
/**
Changes this user's username.
@@ -103,12 +103,9 @@ Discourse.User = Discourse.Model.extend({
@returns Result of ajax call
**/
changeUsername: function(newUsername) {
- return Discourse.ajax({
- url: Discourse.getURL("/users/") + (this.get('username_lower')) + "/preferences/username",
+ return Discourse.ajax("/users/" + (this.get('username_lower')) + "/preferences/username", {
type: 'PUT',
- data: {
- new_username: newUsername
- }
+ data: { new_username: newUsername }
});
},
@@ -120,12 +117,9 @@ Discourse.User = Discourse.Model.extend({
@returns Result of ajax call
**/
changeEmail: function(email) {
- return Discourse.ajax({
- url: Discourse.getURL("/users/") + (this.get('username_lower')) + "/preferences/email",
+ return Discourse.ajax("/users/" + (this.get('username_lower')) + "/preferences/email", {
type: 'PUT',
- data: {
- email: email
- }
+ data: { email: email }
});
},
@@ -147,7 +141,7 @@ Discourse.User = Discourse.Model.extend({
**/
save: function() {
var user = this;
- return Discourse.ajax(Discourse.getURL("/users/") + this.get('username').toLowerCase(), {
+ return Discourse.ajax("/users/" + this.get('username').toLowerCase(), {
data: this.getProperties('auto_track_topics_after_msecs',
'bio_raw',
'website',
@@ -174,7 +168,7 @@ Discourse.User = Discourse.Model.extend({
@returns {Promise} the result of the change password operation
**/
changePassword: function() {
- return Discourse.ajax(Discourse.getURL("/session/forgot_password"), {
+ return Discourse.ajax("/session/forgot_password", {
dataType: 'json',
data: {
login: this.get('username')
@@ -209,13 +203,8 @@ Discourse.User = Discourse.Model.extend({
loadUserAction: function(id) {
var user = this;
var stream = this.get('stream');
- return Discourse.ajax({
- url: Discourse.getURL("/user_actions/") + id + ".json",
- dataType: 'json',
- cache: 'false'
- }).then(function(result) {
+ return Discourse.ajax("/user_actions/" + id + ".json", { cache: 'false' }).then(function(result) {
if (result) {
-
if ((user.get('streamFilter') || result.action_type) !== result.action_type) return;
var action = Em.A();
@@ -374,7 +363,7 @@ Discourse.User = Discourse.Model.extend({
var user = this;
var username = this.get('username');
PreloadStore.getAndRemove("user_" + username, function() {
- return Discourse.ajax({ url: Discourse.getURL("/users/") + username + '.json' });
+ return Discourse.ajax("/users/" + username + '.json');
}).then(function (json) {
// Create a user from the resulting JSON
json.user.stats = Discourse.User.groupStats(json.user.stats.map(function(s) {
@@ -410,13 +399,8 @@ Discourse.User.reopenClass({
@param {String} email An email address to check
**/
checkUsername: function(username, email) {
- return Discourse.ajax({
- url: Discourse.getURL('/users/check_username'),
- type: 'GET',
- data: {
- username: username,
- email: email
- }
+ return Discourse.ajax('/users/check_username', {
+ data: { username: username, email: email }
});
},
@@ -477,9 +461,7 @@ Discourse.User.reopenClass({
@returns Result of ajax call
**/
createAccount: function(name, email, password, username, passwordConfirm, challenge) {
- return Discourse.ajax({
- url: Discourse.getURL("/users"),
- dataType: 'json',
+ return Discourse.ajax("/users", {
data: {
name: name,
email: email,
diff --git a/app/assets/javascripts/discourse/views/header_view.js b/app/assets/javascripts/discourse/views/header_view.js
index 2a3745a19a..80fd2620c1 100644
--- a/app/assets/javascripts/discourse/views/header_view.js
+++ b/app/assets/javascripts/discourse/views/header_view.js
@@ -54,7 +54,7 @@ Discourse.HeaderView = Discourse.View.extend({
showNotifications: function() {
var headerView = this;
- Discourse.ajax(Discourse.getURL('/notifications')).then(function(result) {
+ Discourse.ajax('/notifications').then(function(result) {
headerView.set('notifications', result.map(function(n) {
return Discourse.Notification.create(n);
}));
diff --git a/app/assets/javascripts/discourse/views/modal/create_account_view.js b/app/assets/javascripts/discourse/views/modal/create_account_view.js
index 99e9b8011e..3eaca21b32 100644
--- a/app/assets/javascripts/discourse/views/modal/create_account_view.js
+++ b/app/assets/javascripts/discourse/views/modal/create_account_view.js
@@ -242,7 +242,7 @@ Discourse.CreateAccountView = Discourse.ModalBodyView.extend({
fetchConfirmationValue: function() {
var createAccountView = this;
- return Discourse.ajax(Discourse.getURL('/users/hp.json')).then(function (json) {
+ return Discourse.ajax('/users/hp.json').then(function (json) {
createAccountView.set('accountPasswordConfirm', json.value);
createAccountView.set('accountChallenge', json.challenge.split("").reverse().join(""));
});
diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
index 32ec4f98a3..055296fd1f 100644
--- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js
+++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
@@ -104,8 +104,7 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
).then(function() {
// success
$('#discourse-modal').modal('hide');
- var url = Discourse.getURL("/category/") + categoryView.get('category.name');
- Discourse.URL.redirectTo(url);
+ Discourse.URL.redirectTo("/category/" + categoryView.get('category.name'));
}, function(errors) {
// errors
if(errors.length === 0) errors.push(Em.String.i18n("category.save_error"));
@@ -116,8 +115,7 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
this.get('category').save().then(function(result) {
// success
$('#discourse-modal').modal('hide');
- var url = Discourse.getURL("/category/") + (Discourse.Utilities.categoryUrlId(result.category));
- Discourse.URL.redirectTo(url);
+ Discourse.URL.redirectTo("/category/" + Discourse.Utilities.categoryUrlId(result.category));
}, function(errors) {
// errors
if(errors.length === 0) errors.push(Em.String.i18n("category.creation_error"));
@@ -135,7 +133,7 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
if (result) {
categoryView.get('category').destroy().then(function(){
// success
- Discourse.URL.redirectTo(Discourse.getURL("/categories"));
+ Discourse.URL.redirectTo("/categories");
}, function(jqXHR){
// error
$('#discourse-modal').modal('show');
diff --git a/app/assets/javascripts/discourse/views/modal/forgot_password_view.js b/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
index 976afacdbf..cd8696852a 100644
--- a/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
+++ b/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
@@ -17,7 +17,7 @@ Discourse.ForgotPasswordView = Discourse.ModalBodyView.extend({
submit: function() {
- Discourse.ajax(Discourse.getURL("/session/forgot_password"), {
+ Discourse.ajax("/session/forgot_password", {
data: { login: this.get('accountEmailOrUsername') },
type: 'POST'
});
diff --git a/app/assets/javascripts/discourse/views/modal/login_view.js b/app/assets/javascripts/discourse/views/modal/login_view.js
index 87208eed28..1311b1f5d4 100644
--- a/app/assets/javascripts/discourse/views/modal/login_view.js
+++ b/app/assets/javascripts/discourse/views/modal/login_view.js
@@ -49,7 +49,7 @@ Discourse.LoginView = Discourse.ModalBodyView.extend({
this.set('loggingIn', true);
var loginView = this;
- Discourse.ajax(Discourse.getURL("/session"), {
+ Discourse.ajax("/session", {
data: { login: this.get('loginName'), password: this.get('loginPassword') },
type: 'POST'
}).then(function (result) {
diff --git a/app/assets/javascripts/discourse/views/modal/not_activated_view.js b/app/assets/javascripts/discourse/views/modal/not_activated_view.js
index 7b6e946181..23081a8239 100644
--- a/app/assets/javascripts/discourse/views/modal/not_activated_view.js
+++ b/app/assets/javascripts/discourse/views/modal/not_activated_view.js
@@ -12,7 +12,7 @@ Discourse.NotActivatedView = Discourse.ModalBodyView.extend({
emailSent: false,
sendActivationEmail: function() {
- Discourse.ajax(Discourse.getURL('/users/') + this.get('username') + '/send_activation_email');
+ Discourse.ajax('/users/' + this.get('username') + '/send_activation_email');
this.set('emailSent', true);
}
});
diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index 081ff88b00..c3adb9acf0 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -146,7 +146,7 @@ Discourse.PostView = Discourse.View.extend({
if ($aside.data('topic')) {
topic_id = $aside.data('topic');
}
- Discourse.ajax(Discourse.getURL("/posts/by_number/") + topic_id + "/" + ($aside.data('post'))).then(function (result) {
+ Discourse.ajax("/posts/by_number/" + topic_id + "/" + ($aside.data('post'))).then(function (result) {
var parsed = $(result.cooked);
parsed.replaceText(originalText, "
" + originalText + "");
$blockQuote.showHtml(parsed);
diff --git a/app/assets/javascripts/discourse/views/search/search_view.js b/app/assets/javascripts/discourse/views/search/search_view.js
index 8abee71f0a..0e463d5781 100644
--- a/app/assets/javascripts/discourse/views/search/search_view.js
+++ b/app/assets/javascripts/discourse/views/search/search_view.js
@@ -90,7 +90,7 @@ Discourse.SearchView = Discourse.View.extend({
searchTerm: Discourse.debouncePromise(function(term, typeFilter) {
var searchView = this;
- return Discourse.ajax(Discourse.getURL('/search'), {
+ return Discourse.ajax('/search', {
data: {
term: term,
type_filter: typeFilter
diff --git a/app/views/common/_persona_javascript.html.erb b/app/views/common/_persona_javascript.html.erb
index 8971d915fd..718ca3a778 100644
--- a/app/views/common/_persona_javascript.html.erb
+++ b/app/views/common/_persona_javascript.html.erb
@@ -7,9 +7,8 @@
onlogin: function(assertion) {
if (readyCalled) {
- Discourse.ajax({
+ Discourse.ajax('/auth/persona/callback', {
type: 'POST',
- url: Discourse.getURL('/auth/persona/callback'),
data: { 'assertion': assertion },
success: function(data, textStatus, jqXHR) {
Discourse.authenticationComplete(data);
diff --git a/db/migrate/20130411205132_create_admin_logs.rb b/db/migrate/20130411205132_create_admin_logs.rb
index b9ee3d0c35..197bea30cd 100644
--- a/db/migrate/20130411205132_create_admin_logs.rb
+++ b/db/migrate/20130411205132_create_admin_logs.rb
@@ -1,6 +1,6 @@
class CreateAdminLogs < ActiveRecord::Migration
def up
- create_table :admin_logs do |t|
+ create_table :admin_logs, force: true do |t|
t.integer :action, null: false
t.integer :admin_id, null: false
t.integer :target_user_id
diff --git a/db/migrate/20130416004607_create_groups.rb b/db/migrate/20130416004607_create_groups.rb
index 48495d1ceb..f684f3fc3c 100644
--- a/db/migrate/20130416004607_create_groups.rb
+++ b/db/migrate/20130416004607_create_groups.rb
@@ -1,6 +1,6 @@
class CreateGroups < ActiveRecord::Migration
def change
- create_table :groups do |t|
+ create_table :groups, force: true do |t|
t.string :name, null: false
t.timestamps
end
diff --git a/db/migrate/20130416004933_group_users.rb b/db/migrate/20130416004933_group_users.rb
index 688673e9f4..024d6caaa4 100644
--- a/db/migrate/20130416004933_group_users.rb
+++ b/db/migrate/20130416004933_group_users.rb
@@ -1,6 +1,6 @@
class GroupUsers < ActiveRecord::Migration
def change
- create_table :group_users do |t|
+ create_table :group_users, force: true do |t|
t.integer :group_id, null: false
t.integer :user_id, null: false
t.timestamps
diff --git a/db/migrate/20130429000101_add_security_to_categories.rb b/db/migrate/20130429000101_add_security_to_categories.rb
index 71272b68bf..04f0314112 100644
--- a/db/migrate/20130429000101_add_security_to_categories.rb
+++ b/db/migrate/20130429000101_add_security_to_categories.rb
@@ -2,7 +2,7 @@ class AddSecurityToCategories < ActiveRecord::Migration
def change
add_column :categories, :secure, :boolean, default: false, null: false
- create_table :category_groups do |t|
+ create_table :category_groups, force: true do |t|
t.integer :category_id, null: false
t.integer :group_id, null: false
t.timestamps
diff --git a/db/migrate/20130430052751_add_topic_allowed_groups.rb b/db/migrate/20130430052751_add_topic_allowed_groups.rb
index f4bf13aeef..57bb23fbb2 100644
--- a/db/migrate/20130430052751_add_topic_allowed_groups.rb
+++ b/db/migrate/20130430052751_add_topic_allowed_groups.rb
@@ -1,6 +1,6 @@
class AddTopicAllowedGroups < ActiveRecord::Migration
def change
- create_table :topic_allowed_groups do |t|
+ create_table :topic_allowed_groups, force: true do |t|
# oops
t.integer :group_id, :integer, null: false
t.integer :topic_id, :integer, null: false