Merge pull request #2842 from evazion/fix-user-name-changes

Minor user name changes improvements.

app/controllers/user_name_change_requests_controller.rb

@@ -1,7 +1,9 @@
 class UserNameChangeRequestsController < ApplicationController
-  before_filter :gold_only, :only => [:new, :create, :show]
-  before_filter :admin_only, :only => [:index, :approve, :reject, :destroy]
+  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
+  respond_to :html, :json, :xml
 
   def new
   end
@@ -26,10 +28,12 @@ class UserNameChangeRequestsController < ApplicationController
   def show
     @change_request = UserNameChangeRequest.find(params[:id])
     check_privileges!(@change_request)
+    respond_with(@change_request)
   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])
+    respond_with(@change_requests)
   end
   
   def approve
@@ -38,12 +42,6 @@ class UserNameChangeRequestsController < ApplicationController
     redirect_to user_name_change_request_path(@change_request), :notice => "Name change request approved"
   end
   
-  def destroy
-    @change_request = UserNameChangeRequest.find(params[:id])
-    @change_request.destroy
-    redirect_to user_name_change_requests_path
-  end
-  
   def reject
     @change_request = UserNameChangeRequest.find(params[:id])
     @change_request.reject!(params[:reason])