aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin_outgoing_message_controller.rb2
-rw-r--r--app/views/admin_outgoing_message/edit.html.erb5
-rw-r--r--app/views/admin_request/show.html.erb5
3 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/admin_outgoing_message_controller.rb b/app/controllers/admin_outgoing_message_controller.rb
index 535ec1229..2ee811dc0 100644
--- a/app/controllers/admin_outgoing_message_controller.rb
+++ b/app/controllers/admin_outgoing_message_controller.rb
@@ -5,7 +5,7 @@ class AdminOutgoingMessageController < AdminController
end
def destroy
- @outgoing_message = OutgoingMessage.find(params[:outgoing_message_id])
+ @outgoing_message = OutgoingMessage.find(params[:id])
@info_request = @outgoing_message.info_request
outgoing_message_id = @outgoing_message.id
diff --git a/app/views/admin_outgoing_message/edit.html.erb b/app/views/admin_outgoing_message/edit.html.erb
index 9fae60da9..d84a5ba66 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_outgoing_update_path(@outgoing_message) do %>
+<%= form_tag admin_outgoing_message_path(@outgoing_message), :method => 'put' do %>
<div class="control-group">
<label class="control-label" for="outgoing_message_prominence"> Prominence</label>
<div class="controls">
@@ -40,9 +40,8 @@
<%= link_to 'List all', admin_requests_path %>
</p>
-<%= form_tag admin_outgoing_destroy_path do %>
+<%= form_tag admin_outgoing_message_path(@outgoing_message), :method => 'delete' do %>
<div>
- <%= hidden_field_tag 'outgoing_message_id', @outgoing_message.id %>
<%= submit_tag "Destroy outgoing message", :class => "btn btn-danger", :confirm => "This is permanent! Are you sure?" %>
</div>
<% end %>
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb
index c8931b159..dfb911ea7 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_outgoing_edit_path(outgoing_message) do %>
+ <%= link_to edit_admin_outgoing_message_path(outgoing_message) do %>
#<%= outgoing_message.id %> -- <%= outgoing_message.status.humanize %> <%= outgoing_message.message_type.humanize %>
<% end %>
<blockquote>
@@ -245,8 +245,7 @@
<tbody>
<tr>
<td colspan="2">
- <%= form_tag admin_outgoing_resend_path, :class => "admin-table-form" do %>
- <%= hidden_field_tag 'id', outgoing_message.id %>
+ <%= form_tag resend_admin_outgoing_message_path(outgoing_message), :class => "admin-table-form" do %>
<%= submit_tag "Resend", :class => "btn" %>
<% end %>
</td>