Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vdom

This commit is contained in:
Sam 2016-02-17 18:39:11 +11:00
parent a766f71881 8981ca41f0
commit 1e131a120c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -188,7 +188,7 @@ const User = RestModel.extend({
type: 'PUT' type: 'PUT'
}).then(result => { }).then(result => {
this.set('bio_excerpt', result.user.bio_excerpt); this.set('bio_excerpt', result.user.bio_excerpt);
const userProps = Em.getProperties(this.get('user-option'),'enable_quoting', 'external_links_in_new_tab', 'dynamic_favicon'); const userProps = Em.getProperties(this.get('user_option'),'enable_quoting', 'external_links_in_new_tab', 'dynamic_favicon');
Discourse.User.current().setProperties(userProps); Discourse.User.current().setProperties(userProps);
}).finally(() => { }).finally(() => {
this.set('isSaving', false); this.set('isSaving', false);

2
test/javascripts/fixtures/user_fixtures.js.es6
View File

File diff suppressed because one or more lines are too long