diff options
| -rw-r--r-- | app/views/admin_outgoing_message/edit.html.erb | 6 | ||||
| -rw-r--r-- | app/views/admin_request/_incoming_message_actions.html.erb | 4 | ||||
| -rw-r--r-- | app/views/admin_request/show.html.erb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 12 | ||||
| -rw-r--r-- | spec/integration/admin_spec.rb | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/app/views/admin_outgoing_message/edit.html.erb b/app/views/admin_outgoing_message/edit.html.erb index a0c60520a..b52884bae 100644 --- a/app/views/admin_outgoing_message/edit.html.erb +++ b/app/views/admin_outgoing_message/edit.html.erb @@ -2,7 +2,7 @@ <%= error_messages_for 'outgoing_message' %> -<%= form_tag admin_request_update_outgoing_path(@outgoing_message) do %> +<%= form_tag admin_outgoing_update_path(@outgoing_message) do %> <p><label for="outgoing_message_body">Body of message</label><br/> <%= text_area 'outgoing_message', 'body', :rows => 10, :cols => 60 %></p> @@ -22,10 +22,10 @@ <%= link_to 'List all', admin_request_list_path %> </p> -<%= form_tag admin_request_destroy_outgoing_path do %> +<%= form_tag admin_outgoing_destroy_path do %> <div> <%= hidden_field_tag 'outgoing_message_id', @outgoing_message.id %> - Warning, this is permanent! ---> + Warning, this is permanent! ---> <%= submit_tag "Destroy outgoing message" %> </div> <% end %> diff --git a/app/views/admin_request/_incoming_message_actions.html.erb b/app/views/admin_request/_incoming_message_actions.html.erb index 653e73337..4cf099b53 100644 --- a/app/views/admin_request/_incoming_message_actions.html.erb +++ b/app/views/admin_request/_incoming_message_actions.html.erb @@ -1,6 +1,6 @@ <fieldset class="form-horizontal"> <legend>Actions</legend> - <%= form_tag admin_request_redeliver_incoming_path, :class => "form form-inline" do %> + <%= form_tag admin_incoming_redeliver_path, :class => "form form-inline" do %> <div class="control-group"> <label class="control-label" for="url_title_<%= incoming_message.id %>">Redeliver message to one or more other requests</label> <div class="controls"> @@ -22,7 +22,7 @@ </div> </div> - <%= form_tag admin_request_destroy_incoming_path, :class => "form form-inline" do %> + <%= form_tag admin_incoming_destroy_path, :class => "form form-inline" do %> <div class="control-group"> <label class="control-label" for="destroy_message_<%= incoming_message.id %>">Destroy message</label> <div class="controls"> diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index e18e319be..306fe8281 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -233,7 +233,7 @@ <div class="accordion-group"> <div class="accordion-heading"> <a href="#outgoing_<%=outgoing_message.id%>" data-toggle="collapse" data-parent="#outgoing_messages"><%= chevron_right %></a> - <%= link_to admin_request_edit_outgoing_path(outgoing_message) do %> + <%= link_to admin_outgoing_edit_path(outgoing_message) do %> #<%= outgoing_message.id %> -- <%= outgoing_message.status.humanize %> <%= outgoing_message.message_type.humanize %> <% end %> <blockquote> diff --git a/config/routes.rb b/config/routes.rb index f0b6c199e..14dba96b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -198,15 +198,15 @@ Alaveteli::Application.routes.draw do #### #### AdminIncomingMessage controller - match '/admin/request/destroy_incoming' => 'admin_incoming_message#destroy', :as => :admin_request_destroy_incoming - match '/admin/request/redeliver_incoming' => 'admin_incoming_message#redeliver', :as => :admin_request_redeliver_incoming - match '/admin/request/update_incoming/:id' => 'admin_incoming_message#update', :as => :admin_request_update_incoming + match '/admin/incoming/destroy' => 'admin_incoming_message#destroy', :as => :admin_incoming_destroy + match '/admin/incoming/redeliver' => 'admin_incoming_message#redeliver', :as => :admin_incoming_redeliver + match '/admin/incoming/update/:id' => 'admin_incoming_message#update', :as => :admin_incoming_update #### #### AdminOutgoingMessage controller - match '/admin/request/edit_outgoing/:id' => 'admin_outgoing_message#edit', :as => :admin_request_edit_outgoing - match '/admin/request/destroy_outgoing/:id' => 'admin_outgoing_message#destroy', :as => :admin_request_destroy_outgoing - match '/admin/request/update_outgoing/:id' => 'admin_outgoing_message#update', :as => :admin_request_update_outgoing + match '/admin/outgoing/edit/:id' => 'admin_outgoing_message#edit', :as => :admin_outgoing_edit + match '/admin/outgoing/destroy/:id' => 'admin_outgoing_message#destroy', :as => :admin_outgoing_destroy + match '/admin/outgoing/update/:id' => 'admin_outgoing_message#update', :as => :admin_outgoing_update #### #### AdminUser controller diff --git a/spec/integration/admin_spec.rb b/spec/integration/admin_spec.rb index 5842eeb00..8e6351d2c 100644 --- a/spec/integration/admin_spec.rb +++ b/spec/integration/admin_spec.rb @@ -38,7 +38,7 @@ describe "When administering the site" do ir.incoming_messages.length.should == 1 post_params = {'redeliver_incoming_message_id' => new_im.id, 'url_title' => ir.url_title} - admin.post '/en/admin/request/redeliver_incoming', post_params + admin.post '/en/admin/incoming/redeliver', post_params admin.response.location.should == 'http://www.example.com/en/admin/request/show/101' ir = InfoRequest.find_by_url_title(ir.url_title) ir.incoming_messages.length.should == 2 @@ -62,7 +62,7 @@ describe "When administering the site" do new_im = InfoRequest.holding_pen_request.incoming_messages[0] post_params = {'redeliver_incoming_message_id' => new_im.id, 'url_title' => "#{ir1.url_title},#{ir2.url_title}"} - admin.post '/en/admin/request/redeliver_incoming', post_params + admin.post '/en/admin/incoming/redeliver', post_params ir1.reload ir1.incoming_messages.length.should == 2 ir2.reload |