discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: don't show the avatar section when overriden by SSO

Browse Source
This commit is contained in:
Régis Hanol 2018-07-23 12:03:43 +02:00
parent 84ab825e41
commit 9b2d6053da
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/routes/preferences.js.es6
View File

@ -9,8 +9,10 @@ export default RestrictedUserRoute.extend({
}, },
actions: { actions: {
showAvatarSelector() { showAvatarSelector(user) {
const props = this.modelFor("user").getProperties( user = user || this.modelFor("user");
const props = user.getProperties(
"id", "id",
"email", "email",
"username", "username",
@ -34,6 +36,8 @@ export default RestrictedUserRoute.extend({
props.selected = "uploaded"; props.selected = "uploaded";
} }
props.user = user;
const controller = showModal("avatar-selector"); const controller = showModal("avatar-selector");
controller.setProperties(props); controller.setProperties(props);
@ -45,18 +49,17 @@ export default RestrictedUserRoute.extend({
}, },
selectAvatar(url) { selectAvatar(url) {
const user = this.modelFor("user"); const controller = this.controllerFor("avatar-selector");
controller.send("closeModal");
this.controllerFor("avatar-selector").send("closeModal"); controller
.get("user")
user
.selectAvatar(url) .selectAvatar(url)
.then(() => window.location.reload()) .then(() => window.location.reload())
.catch(popupAjaxError); .catch(popupAjaxError);
}, },
saveAvatarSelection() { saveAvatarSelection() {
const user = this.modelFor("user");
const controller = this.controllerFor("avatar-selector"); const controller = this.controllerFor("avatar-selector");
const selectedUploadId = controller.get("selectedUploadId"); const selectedUploadId = controller.get("selectedUploadId");
const selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); const selectedAvatarTemplate = controller.get("selectedAvatarTemplate");
@ -64,7 +67,8 @@ export default RestrictedUserRoute.extend({
controller.send("closeModal"); controller.send("closeModal");
user controller
.get("user")
.pickAvatar(selectedUploadId, type, selectedAvatarTemplate) .pickAvatar(selectedUploadId, type, selectedAvatarTemplate)
.then(() => window.location.reload()) .then(() => window.location.reload())
.catch(popupAjaxError); .catch(popupAjaxError);

16
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -99,16 +99,16 @@
</div> </div>
{{/if}} {{/if}}
<div class="control-group pref-avatar"> {{#unless siteSettings.sso_overrides_avatar}}
<label class="control-label">{{i18n 'user.avatar.title'}}</label> <div class="control-group pref-avatar">
<div class="controls"> <label class="control-label">{{i18n 'user.avatar.title'}}</label>
{{! we want the "huge" version even though we're downsizing it to "large" in CSS }} <div class="controls">
{{bound-avatar model "huge"}} {{! we want the "huge" version even though we're downsizing it in CSS }}
{{#unless siteSettings.sso_overrides_avatar}} {{bound-avatar model "huge"}}
{{d-button action="showAvatarSelector" class="pad-left" icon="pencil"}} {{d-button action="showAvatarSelector" class="pad-left" icon="pencil"}}
{{/unless}} </div>
</div> </div>
</div> {{/unless}}
{{#if canSelectTitle}} {{#if canSelectTitle}}
<div class="control-group pref-title"> <div class="control-group pref-title">