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

FIX: regression in badge grant admin page

This commit is contained in:
Sam 2016-03-29 07:58:45 +11:00
parent e364eb2aad
commit c650c2a16f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/user_badges.hbs
View File

@ -16,7 +16,7 @@
<form class="form-horizontal"> <form class="form-horizontal">
<div> <div>
<label>{{i18n 'admin.badges.badge'}}</label> <label>{{i18n 'admin.badges.badge'}}</label>
{{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="displayName"}} {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="name"}}
</div> </div>
<label> <label>
<label>{{i18n 'admin.badges.reason'}}</label> <label>{{i18n 'admin.badges.reason'}}</label>

1
config/routes.rb
View File

@ -111,6 +111,7 @@ Discourse::Application.routes.draw do
end end
get "users/:id.json" => 'users#show', defaults: {format: 'json'} get "users/:id.json" => 'users#show', defaults: {format: 'json'}
get 'users/:id/:username' => 'users#show' get 'users/:id/:username' => 'users#show'
get 'users/:id/:username/badges' => 'users#show'
post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new