Use RESTful routing for index and show actions

4 files changed, 18 insertions, 23 deletions

diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb
index 68ca57510..dd0af002d 100644
--- a/app/controllers/admin_censor_rule_controller.rb
+++ b/app/controllers/admin_censor_rule_controller.rb
@@ -52,7 +52,7 @@ class AdminCensorRuleController < AdminController
             flash[:notice] = 'CensorRule was successfully created.'
 
             if !@censor_rule.info_request.nil?
-                redirect_to admin_request_show_url(@censor_rule.info_request)
+                redirect_to admin_request_url(@censor_rule.info_request)
             elsif !@censor_rule.user.nil?
                 redirect_to admin_user_show_url(@censor_rule.user)
             else
@@ -83,7 +83,7 @@ class AdminCensorRuleController < AdminController
             flash[:notice] = 'CensorRule was successfully updated.'
 
             if !@censor_rule.info_request.nil?
-                redirect_to admin_request_show_url(@censor_rule.info_request)
+                redirect_to admin_request_url(@censor_rule.info_request)
             elsif !@censor_rule.user.nil?
                 redirect_to admin_user_show_url(@censor_rule.user)
             else
@@ -112,7 +112,7 @@ class AdminCensorRuleController < AdminController
         flash[:notice] = "CensorRule was successfully destroyed."
 
         if !info_request.nil?
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
         elsif !user.nil?
             redirect_to admin_user_show_url(user)
         else
diff --git a/app/controllers/admin_incoming_message_controller.rb b/app/controllers/admin_incoming_message_controller.rb
index 6b50d0e36..46460d466 100644
--- a/app/controllers/admin_incoming_message_controller.rb
+++ b/app/controllers/admin_incoming_message_controller.rb
@@ -20,7 +20,7 @@ class AdminIncomingMessageController < AdminController
                                                     :prominence_reason => @incoming_message.prominence_reason)
             expire_for_request(@incoming_message.info_request)
             flash[:notice] = 'Incoming message successfully updated.'
-            redirect_to admin_request_show_url(@incoming_message.info_request)
+            redirect_to admin_request_url(@incoming_message.info_request)
         else
             render :action => 'edit'
         end
@@ -37,7 +37,7 @@ class AdminIncomingMessageController < AdminController
         # expire cached files
         expire_for_request(@info_request)
         flash[:notice] = 'Incoming message successfully destroyed.'
-        redirect_to admin_request_show_url(@info_request)
+        redirect_to admin_request_url(@info_request)
     end
 
     def redeliver
@@ -54,7 +54,7 @@ class AdminIncomingMessageController < AdminController
                 end
                 if destination_request.nil?
                     flash[:error] = "Failed to find destination request '" + m + "'"
-                    return redirect_to admin_request_show_url(previous_request)
+                    return redirect_to admin_request_url(previous_request)
                 end
 
                 raw_email_data = incoming_message.raw_email.data
@@ -74,7 +74,7 @@ class AdminIncomingMessageController < AdminController
             expire_for_request(previous_request)
             incoming_message.fully_destroy
         end
-        redirect_to admin_request_show_url(destination_request)
+        redirect_to admin_request_url(destination_request)
     end
 
 end
diff --git a/app/controllers/admin_outgoing_message_controller.rb b/app/controllers/admin_outgoing_message_controller.rb
index ec0981677..76166ec05 100644
--- a/app/controllers/admin_outgoing_message_controller.rb
+++ b/app/controllers/admin_outgoing_message_controller.rb
@@ -14,7 +14,7 @@ class AdminOutgoingMessageController < AdminController
             { :editor => admin_current_user(), :deleted_outgoing_message_id => outgoing_message_id })
 
         flash[:notice] = 'Outgoing message successfully destroyed.'
-        redirect_to admin_request_show_url(@info_request)
+        redirect_to admin_request_url(@info_request)
     end
 
     def update
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 8f023bf12..90811104b 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -8,11 +8,6 @@ require 'ostruct'
 
 class AdminRequestController < AdminController
     def index
-        list
-        render :action => 'list'
-    end
-
-    def list
         @query = params[:query]
         if @query
             info_requests = InfoRequest.where(["lower(title) like lower('%'||?||'%')", @query])
@@ -108,7 +103,7 @@ class AdminRequestController < AdminController
             # expire cached files
             expire_for_request(@info_request)
             flash[:notice] = 'Request successfully updated.'
-            redirect_to admin_request_show_url(@info_request)
+            redirect_to admin_request_url(@info_request)
         else
             render :action => 'edit'
         end
@@ -125,7 +120,7 @@ class AdminRequestController < AdminController
         expire_for_request(@info_request)
         email = user.try(:email) ? user.email : 'This request is external so has no associated user'
         flash[:notice] = "Request #{ url_title } has been completely destroyed. Email of user who made request: #{ email }"
-        redirect_to admin_request_list_url
+        redirect_to admin_requests_url
     end
 
     def edit_comment
@@ -146,7 +141,7 @@ class AdminRequestController < AdminController
                     :old_visible => old_visible, :visible => @comment.visible,
                 })
             flash[:notice] = 'Comment successfully updated.'
-            redirect_to admin_request_show_url(@comment.info_request)
+            redirect_to admin_request_url(@comment.info_request)
         else
             render :action => 'edit_comment'
         end
@@ -172,7 +167,7 @@ class AdminRequestController < AdminController
                 info_request.reindex_request_events
                 flash[:notice] = "Message has been moved to new user"
             end
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
         elsif params[:commit] == 'Move request to authority' && !params[:public_body_url_name].blank?
             old_public_body = info_request.public_body
             destination_public_body = PublicBody.find_by_url_name(params[:public_body_url_name])
@@ -191,10 +186,10 @@ class AdminRequestController < AdminController
                 flash[:notice] = "Request has been moved to new body"
             end
 
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
         else
             flash[:error] = "Please enter the user or authority to move the request to"
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
         end
     end
 
@@ -218,7 +213,7 @@ class AdminRequestController < AdminController
 
         if !info_request.public_body.is_foi_officer?(user)
             flash[:notice] = user.email + " is not an email at the domain @" + info_request.public_body.foi_officer_domain_required + ", so won't be able to upload."
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
             return
         end
 
@@ -231,7 +226,7 @@ class AdminRequestController < AdminController
         url = confirm_url(:email_token => post_redirect.email_token)
 
         flash[:notice] = ("Send \"#{name}\" &lt;<a href=\"mailto:#{email}\">#{email}</a>&gt; this URL: <a href=\"#{url}\">#{url}</a> - it will log them in and let them upload a response to this request.").html_safe
-        redirect_to admin_request_show_url(info_request)
+        redirect_to admin_request_url(info_request)
     end
 
     def show_raw_email
@@ -281,7 +276,7 @@ class AdminRequestController < AdminController
         info_request_event.save!
 
         flash[:notice] = "Old response marked as having been a clarification"
-        redirect_to admin_request_show_url(info_request_event.info_request)
+        redirect_to admin_request_url(info_request_event.info_request)
     end
 
     def hide_request
@@ -314,7 +309,7 @@ class AdminRequestController < AdminController
             end
             # expire cached files
             expire_for_request(info_request)
-            redirect_to admin_request_show_url(info_request)
+            redirect_to admin_request_url(info_request)
         end
     end