aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-03-15 16:29:11 +1100
committerHenare Degan <henare.degan@gmail.com>2013-03-15 16:29:11 +1100
commit08abaf8d391729a2cbcc38ab2db94e1a340d1182 (patch)
tree5ecee29c8dbaebbf65145264b4ab18dcad532d7b
parent210fad894c3bb2b462001a42d33f6941c4ba38bb (diff)
Fix describe_state_message from the merge
-rw-r--r--app/views/request/describe_state_message.html.erb (renamed from app/views/request/describe_state_message.rhtml)2
-rw-r--r--config/routes.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/request/describe_state_message.rhtml b/app/views/request/describe_state_message.html.erb
index 1427fea22..73237759f 100644
--- a/app/views/request/describe_state_message.rhtml
+++ b/app/views/request/describe_state_message.html.erb
@@ -9,7 +9,7 @@
<% end %>
</p>
-<% form_for :incoming_message, :url => describe_state_url(:id => @info_request.id) do |f| %>
+<%= form_for :incoming_message, :url => describe_state_url(:id => @info_request.id) do |f| %>
<p>
<label class="form_label" for="incoming_message_message">Please tell us more:</label>
diff --git a/config/routes.rb b/config/routes.rb
index a32ae6e59..d045a060e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,7 @@ Alaveteli::Application.routes.draw do
match '/similar/request/:url_title' => 'request#similar', :as => :similar_request
match '/request/:id/describe' => 'request#describe_state', :as => :describe_state, :via => :post
+ match '/request/:url_title/describe/:described_state' => 'request#describe_state_message', :as => :describe_state_message
match '/request/:id/response' => 'request#show_response', :as => :show_response_no_followup
match '/request/:id/response/:incoming_message_id' => 'request#show_response', :as => :show_response
match '/request/:id/response/:incoming_message_id/attach/html/:part/*file_name' => 'request#get_attachment_as_html', :as => :get_attachment_as_html