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: allow selection of no title

Browse Source
This commit is contained in:
Sam 2014-07-14 18:06:50 +10:00
parent 192e286b15
commit 4a2cc269ab
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
View File

@ -18,7 +18,13 @@ export default Ember.ArrayController.extend({
} }
}.property('saving'), }.property('saving'),
selectableUserBadges: Em.computed.filterBy('model', 'badge.allow_title', true), selectableUserBadges: function() {
var items = this.get('model').filterBy('badge.allow_title', true);
items.unshiftObject(Em.Object.create({
badge: Discourse.Badge.create({name: I18n.t('badges.no_title')})
}));
return items;
}.property('model'),
selectedUserBadge: function() { selectedUserBadge: function() {
var selectedUserBadgeId = parseInt(this.get('selectedUserBadgeId')); var selectedUserBadgeId = parseInt(this.get('selectedUserBadgeId'));

4
app/assets/javascripts/discourse/templates/user/badge-title.js.handlebars
View File

@ -8,9 +8,9 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">{{i18n badges.title}}</label> <label class="control-label"></label>
<div class="controls"> <div class="controls">
{{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}} {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.displayName" content=selectableUserBadges}}
</div> </div>
</div> </div>

7
app/controllers/users_controller.rb
View File

@ -67,10 +67,13 @@ class UsersController < ApplicationController
user = fetch_user_from_params user = fetch_user_from_params
guardian.ensure_can_edit!(user) guardian.ensure_can_edit!(user)
user_badge = UserBadge.find(params[:user_badge_id]) user_badge = UserBadge.find_by(id: params[:user_badge_id])
if user_badge.user == user && user_badge.badge.allow_title? if user_badge && user_badge.user == user && user_badge.badge.allow_title?
user.title = user_badge.badge.name user.title = user_badge.badge.name
user.save! user.save!
else
user.title = ''
user.save!
end end
render nothing: true render nothing: true

1
config/locales/client.en.yml
View File

@ -1953,6 +1953,7 @@ en:
one: "1 granted" one: "1 granted"
other: "%{count} granted" other: "%{count} granted"
select_badge_for_title: Select a badge to use as your title select_badge_for_title: Select a badge to use as your title
no_title: "<no title>"
badge: badge:
editor: editor:
name: Editor name: Editor