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

FIX: `user_custom_preferences` did not match other outlet names

This commit is contained in:
Robin Ward 2015-08-31 11:05:09 -04:00
parent 43c62d413c
commit ce0a50eae1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
View File

@ -62,11 +62,18 @@ function findOutlets(collection, callback) {
}
}
const segments = res.split("/"),
outletName = segments[segments.length-2],
uniqueName = segments[segments.length-1];
const segments = res.split("/");
const outletName = segments[segments.length-2];
const uniqueName = segments[segments.length-1];
const dashedName = outletName.replace(/_/g, '-');
if (dashedName !== outletName) {
Ember.warn("DEPRECATION: You need to use dashes in outlet names, not underscores");
callback(dashedName, res, uniqueName);
} else {
callback(outletName, res, uniqueName);
}
callback(outletName, res, uniqueName);
}
});
}

2
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@ -216,7 +216,7 @@
{{preference-checkbox labelKey="user.edit_history_public" checked=model.edit_history_public}}
{{/unless}}
{{plugin-outlet "user_custom_preferences"}}
{{plugin-outlet "user-custom-preferences"}}
</div>
<div class="control-group category">