diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
| commit | d5045bf83cff620545b93c185e411216f814ffdd (patch) | |
| tree | 04f9a953cbfcdeba9c3d1affd6cd40dc6b61dd33 /config/routes.rb | |
| parent | bf6fc976fb29adbc8d46336d3d010c99effcaef0 (diff) | |
| parent | 20ec9b49f3407223b7cbcb25a636ba44a4b6967c (diff) | |
Merge remote-tracking branch 'openaustralia_github/one_support_email_on_admin_attention_state' into develop
Conflicts:
Gemfile.lock
app/controllers/request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
spec/models/request_mailer_spec.rb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index ee7ebdcac..a18295f7b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -54,7 +54,8 @@ ActionController::Routing::Routes.draw do |map| request.details_request '/details/request/:url_title', :action => 'details' request.similar_request '/similar/request/:url_title', :action => 'similar' - request.describe_state '/request/:id/describe', :action => 'describe_state' + request.describe_state '/request/:id/describe', :action => 'describe_state', :conditions => {:method => :post} + request.describe_state_message '/request/:url_title/describe/:described_state', :action => 'describe_state_message' request.show_response_no_followup '/request/:id/response', :action => 'show_response' request.show_response '/request/:id/response/:incoming_message_id', :action => 'show_response' request.get_attachment_as_html '/request/:id/response/:incoming_message_id/attach/html/:part/*file_name', :action => 'get_attachment_as_html' |