Move outgoing message admin actions to their own controller.

Eventually this should use standard RESTful routing.

3 files changed, 36 insertions, 33 deletions

diff --git a/app/controllers/admin_outgoing_message_controller.rb b/app/controllers/admin_outgoing_message_controller.rb
new file mode 100644
index 000000000..3f53838d6
--- /dev/null
+++ b/app/controllers/admin_outgoing_message_controller.rb
@@ -0,0 +1,36 @@
+class AdminOutgoingMessageController < AdminController
+
+    def edit
+        @outgoing_message = OutgoingMessage.find(params[:id])
+    end
+
+    def destroy
+        @outgoing_message = OutgoingMessage.find(params[:outgoing_message_id])
+        @info_request = @outgoing_message.info_request
+        outgoing_message_id = @outgoing_message.id
+
+        @outgoing_message.fully_destroy
+        @outgoing_message.info_request.log_event("destroy_outgoing",
+            { :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)
+    end
+
+    def update
+        @outgoing_message = OutgoingMessage.find(params[:id])
+
+        old_body = @outgoing_message.body
+
+        if @outgoing_message.update_attributes(params[:outgoing_message])
+            @outgoing_message.info_request.log_event("edit_outgoing",
+                { :outgoing_message_id => @outgoing_message.id, :editor => admin_current_user(),
+                    :old_body => old_body, :body => @outgoing_message.body })
+            flash[:notice] = 'Outgoing message successfully updated.'
+            redirect_to admin_request_show_url(@outgoing_message.info_request)
+        else
+            render :action => 'edit'
+        end
+    end
+
+end
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 66989ea93..d965b86b0 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -106,39 +106,6 @@ class AdminRequestController < AdminController
         redirect_to admin_request_list_url
     end
 
-    def edit_outgoing
-        @outgoing_message = OutgoingMessage.find(params[:id])
-    end
-
-    def destroy_outgoing
-        @outgoing_message = OutgoingMessage.find(params[:outgoing_message_id])
-        @info_request = @outgoing_message.info_request
-        outgoing_message_id = @outgoing_message.id
-
-        @outgoing_message.fully_destroy
-        @outgoing_message.info_request.log_event("destroy_outgoing",
-            { :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)
-    end
-
-    def update_outgoing
-        @outgoing_message = OutgoingMessage.find(params[:id])
-
-        old_body = @outgoing_message.body
-
-        if @outgoing_message.update_attributes(params[:outgoing_message])
-            @outgoing_message.info_request.log_event("edit_outgoing",
-                { :outgoing_message_id => @outgoing_message.id, :editor => admin_current_user(),
-                    :old_body => old_body, :body => @outgoing_message.body })
-            flash[:notice] = 'Outgoing message successfully updated.'
-            redirect_to admin_request_show_url(@outgoing_message.info_request)
-        else
-            render :action => 'edit_outgoing'
-        end
-    end
-
     def edit_comment
         @comment = Comment.find(params[:id])
     end
diff --git a/app/views/admin_request/edit_outgoing.html.erb b/app/views/admin_outgoing_message/edit.html.erb
index a0c60520a..a0c60520a 100644
--- a/app/views/admin_request/edit_outgoing.html.erb
+++ b/app/views/admin_outgoing_message/edit.html.erb