From c650c2a16ff8fc045228cb3a2719b5df813de2b5 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 29 Mar 2016 07:58:45 +1100
Subject: [PATCH] FIX: regression in badge grant admin page
---
app/assets/javascripts/admin/templates/user_badges.hbs | 2 +-
config/routes.rb | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index 281a37e08..772360d21 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -16,7 +16,7 @@
<form class="form-horizontal">
<div>
<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>
<label>
<label>{{i18n 'admin.badges.reason'}}</label>
diff --git a/config/routes.rb b/config/routes.rb
index 0e75b73ed..c8de5b650 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,7 @@ Discourse::Application.routes.draw do
end
get "users/:id.json" => 'users#show', defaults: {format: 'json'}
get 'users/:id/:username' => 'users#show'
+ get 'users/:id/:username/badges' => 'users#show'
post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new