From 9e9fdcb55d926755029b7a2d5c8ac90c33b814b4 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 15 Jan 2017 03:23:41 +0000
Subject: [PATCH] Name changes: make /user_name_change_requests member+; add
 reason/status/date.

---
 .../user_name_change_requests_controller.rb   |  7 ++---
 .../user_name_change_requests/index.html.erb  | 26 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb
index ddfdbd734..a367788f5 100644
--- a/app/controllers/user_name_change_requests_controller.rb
+++ b/app/controllers/user_name_change_requests_controller.rb
@@ -1,6 +1,7 @@
 class UserNameChangeRequestsController < ApplicationController
-  before_filter :gold_only, :only => [:new, :create, :show]
-  before_filter :admin_only, :only => [:index, :approve, :reject]
+  before_filter :member_only, :only => [:index, :show]
+  before_filter :gold_only, :only => [:new, :create]
+  before_filter :admin_only, :only => [:approve, :reject]
   rescue_from User::PrivilegeError, :with => :access_denied
 
   def new
@@ -29,7 +30,7 @@ class UserNameChangeRequestsController < ApplicationController
   end
   
   def index
-    @change_requests = UserNameChangeRequest.order("id desc").paginate(params[:page], :limit => params[:limit])
+    @change_requests = UserNameChangeRequest.visible.order("id desc").paginate(params[:page], :limit => params[:limit])
   end
   
   def approve
diff --git a/app/views/user_name_change_requests/index.html.erb b/app/views/user_name_change_requests/index.html.erb
index 6cdb482fd..99ee015bc 100644
--- a/app/views/user_name_change_requests/index.html.erb
+++ b/app/views/user_name_change_requests/index.html.erb
@@ -5,15 +5,35 @@
     <thead>
       <tr>
         <th>User</th>
-        <th>Desired</th>
+        <th>Request</th>
+        <th>Reason</th>
+        <th>Status</th>
+        <th>Date</th>
         <th></th>
       </tr>
     </thead>
     <tbody>
       <% @change_requests.each do |change_request| %>
         <tr>
-          <td><%= link_to change_request.original_name, user_path(change_request.user_id) %></td>
-          <td><%= change_request.desired_name %></td>
+          <td><%= link_to_user change_request.user %></td>
+          <td>
+            <strong><%= change_request.original_name %></strong> ->
+            <strong><%= change_request.desired_name %></strong>
+          </td>
+          <td>
+            <% if CurrentUser.is_admin? || CurrentUser.user == change_request.user %>
+              <%= change_request.change_reason %>
+            <% end %>
+          </td>
+          <td>
+            <%= change_request.status %>
+            <% if change_request.approved? %>
+              by <%= link_to_user change_request.approver %>
+            <% elsif change_request.rejected? %>
+              for reason: <%= link_to change_request.rejection_reason %>
+            <% end %>
+          </td>
+          <td><%= compact_time change_request.created_at %></td>
           <td><%= link_to "view", user_name_change_request_path(change_request) %></td>
         </tr>
       <% end %>