IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fix select badge as user title on badge page (#7682)

Browse Source
This commit is contained in:
Maja Komel 2019-06-04 10:19:30 +02:00 committed by Sam
parent 5819e446dd
commit 2863e7c181
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/components/badge-title.js.es6
View File

@ -13,16 +13,19 @@ export default Ember.Component.extend(BadgeSelectController, {
const badge_id = this.selectedUserBadgeId || 0; const badge_id = this.selectedUserBadgeId || 0;
ajax(this.get("user.path") + "/preferences/badge_title", { ajax(this.currentUser.path + "/preferences/badge_title", {
type: "PUT", type: "PUT",
data: { user_badge_id: badge_id } data: { user_badge_id: badge_id }
}).then( }).then(
() => { () => {
this.setProperties({ this.setProperties({
saved: true, saved: true,
saving: false, saving: false
"user.title": this.get("selectedUserBadge.badge.name")
}); });
this.currentUser.set(
"title",
this.get("selectedUserBadge.badge.name")
);
}, },
() => { () => {
bootbox.alert(I18n.t("generic_error")); bootbox.alert(I18n.t("generic_error"));

5
app/assets/javascripts/discourse/routes/badges-show.js.es6
View File

@ -30,15 +30,16 @@ export default Discourse.Route.extend({
}, },
afterModel(model, transition) { afterModel(model, transition) {
const username = const usernameFromParams =
transition.to.queryParams && transition.to.queryParams.username; transition.to.queryParams && transition.to.queryParams.username;
const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), { const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {
username username: usernameFromParams
}).then(userBadges => { }).then(userBadges => {
this.userBadgesGrant = userBadges; this.userBadgesGrant = userBadges;
}); });
const username = this.currentUser && this.currentUser.username_lower;
const userBadgesAll = UserBadge.findByUsername(username).then( const userBadgesAll = UserBadge.findByUsername(username).then(
userBadges => { userBadges => {
this.userBadgesAll = userBadges; this.userBadgesAll = userBadges;

1
app/assets/javascripts/discourse/templates/components/badge-title.hbs
View File

@ -8,7 +8,6 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label"></label>
<div class="controls"> <div class="controls">
{{combo-box {{combo-box
value=selectedUserBadgeId value=selectedUserBadgeId