github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: A couple of other deprecations to keep discourse-tagging happy

Browse Source
This commit is contained in:
Robin Ward
2015-04-15 22:36:16 -04:00
parent a1cbd31166
commit b2f34da477
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/lib/show-modal.js.es6
View File

@ -1,6 +1,11 @@
export default (name, opts) => { export default (name, opts) => {
opts = opts || {}; opts = opts || {};
if (opts.__type) {
Ember.warn("showModal now takes `opts` as a second param instead of a model");
opts = {model: opts};
}
const container = Discourse.__container__; const container = Discourse.__container__;
// We use the container here because modals are like singletons // We use the container here because modals are like singletons

11
app/assets/javascripts/discourse/models/rest.js.es6
View File

@ -18,7 +18,16 @@ const RestModel = Ember.Object.extend(Presence, {
const self = this; const self = this;
self.set('isSaving', true); self.set('isSaving', true);
return store.update(type, this.get('id'), props).then(function(res) { return store.update(type, this.get('id'), props).then(function(res) {
self.setProperties(self.__munge(res.payload || res.responseJson));
res = self.__munge(res.payload || res.responseJson);
console.log(res);
if (res.success === "OK") {
Ember.warn("An update call should return the updated attributes");
res = props;
}
self.setProperties(res);
self.afterUpdate(res); self.afterUpdate(res);
return res; return res;
}).finally(() => this.set('isSaving', false)); }).finally(() => this.set('isSaving', false));