aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/admin_request/_incoming_message_actions.html.erb5
-rw-r--r--app/views/admin_request/show.html.erb4
-rw-r--r--config/routes.rb2
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/admin_request/_incoming_message_actions.html.erb b/app/views/admin_request/_incoming_message_actions.html.erb
index 22effcce5..672ce3ae2 100644
--- a/app/views/admin_request/_incoming_message_actions.html.erb
+++ b/app/views/admin_request/_incoming_message_actions.html.erb
@@ -18,7 +18,10 @@
<div class="control-group">
<label class="control-label">Generate FOI officer upload URL</label>
<div class="controls">
- <%= link_to 'Generate and take me there', admin_request_generate_upload_url_path(incoming_message.info_request, :incoming_message_id => incoming_message.id), :class => "btn" %>
+ <%= form_tag generate_upload_url_admin_request_path(incoming_message.info_request), :class => "form form-inline" do %>
+ <%= hidden_field_tag 'incoming_message_id', incoming_message.id, :id => nil %>
+ <%= submit_tag "Generate and take me there", :class => "btn" %>
+ <% end %>
</div>
</div>
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb
index 735d71734..38cd06b64 100644
--- a/app/views/admin_request/show.html.erb
+++ b/app/views/admin_request/show.html.erb
@@ -116,7 +116,9 @@
FOI officer upload URL
</label>
<div class="controls">
- <%= link_to 'Generate URL', admin_request_generate_upload_url_path(@info_request), :class => "btn" %>
+ <%= form_tag generate_upload_url_admin_request_path(@info_request), :class => "form form-inline" do %>
+ <%= submit_tag "Generate URL", :class => "btn" %>
+ <% end %>
<p class="help-block">(see also option to generate URLs for individual incoming messages below)</p>
</div>
</div>
diff --git a/config/routes.rb b/config/routes.rb
index beebad609..73d8b3730 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -218,13 +218,13 @@ Alaveteli::Application.routes.draw do
:controller => 'admin_request',
:except => [:new, :create] do
post 'move', :on => :member
+ post 'generate_upload_url', :on => :member
end
end
match '/admin/request/edit/:id' => 'admin_request#edit', :as => :admin_request_edit
match '/admin/request/update/:id' => 'admin_request#update', :as => :admin_request_update
match '/admin/request/edit_comment/:id' => 'admin_request#edit_comment', :as => :admin_request_edit_comment
match '/admin/request/update_comment/:id' => 'admin_request#update_comment', :as => :admin_request_update_comment
- match '/admin/request/generate_upload_url/:id' => 'admin_request#generate_upload_url', :as => :admin_request_generate_upload_url
match '/admin/request/show_raw_email/:id' => 'admin_request#show_raw_email', :as => :admin_request_show_raw_email
match '/admin/request/download_raw_email/:id' => 'admin_request#download_raw_email', :as => :admin_request_download_raw_email
match '/admin/request/mark_event_as_clarification' => 'admin_request#mark_event_as_clarification', :as => :admin_request_clarification