From 70aa33f08bb8f4e95bd72a4d9b7cc87931cb6e89 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 29 Mar 2013 15:40:38 -0400 Subject: [PATCH] fixes #1128 --- app/models/user_name_change_request.rb | 4 ++++ app/views/user_name_change_requests/show.html.erb | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index 853b1d08f..aef9e5ee9 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -22,6 +22,10 @@ class UserNameChangeRequest < ActiveRecord::Base status == "rejected" end + def approved? + status == "approved" + end + def normalize_name self.desired_name = desired_name.strip.gsub(/ /, "_") end diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index eea761650..2e4bf38f5 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -37,6 +37,12 @@

Request was rejected

+ + <% elsif @change_request.approved? %> +
+

Request was approved by <%= @change_request.approver.name %>

+
+ <% elsif CurrentUser.user.is_admin? %>

Options