diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-15 22:49:03 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-15 22:49:03 +0000 |
| commit | 84dd4ecbd4a0b5639eda9875306db6b501aba161 (patch) | |
| tree | 2f75d5cf71ca3d2d3ac405010d4ae2420fe82255 | |
| parent | f7618160ad0178b4ce2eb624cd0771acad227887 (diff) | |
| download | redmine-84dd4ecbd4a0b5639eda9875306db6b501aba161.tar.gz redmine-84dd4ecbd4a0b5639eda9875306db6b501aba161.zip | |
route: split issue preview route to adding and editing
"No route matches" error raises in "preview_issue_path"
at app/views/issues/new.html.erb:35 on Rails 3.0.11 and Rails 3.1.3 new route format.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8886 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/issues/_edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/journals/_notes_form.html.erb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 6 | ||||
| -rw-r--r-- | test/integration/routing/previews_test.rb | 8 |
5 files changed, 13 insertions, 7 deletions
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 82824b85f..809194779 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -39,7 +39,7 @@ <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %> <%= submit_tag l(:button_submit) %> <%= link_to_remote l(:label_preview), - { :url => preview_issue_path(:project_id => @project, :id => @issue), + { :url => preview_edit_issue_path(:project_id => @project, :id => @issue), :method => 'post', :update => 'preview', :with => 'Form.serialize("issue-form")', diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index bddb62788..08e69cdad 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -32,7 +32,7 @@ <%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> <%= link_to_remote l(:label_preview), - { :url => preview_issue_path(:project_id => @project), + { :url => preview_new_issue_path(:project_id => @project), :method => 'post', :update => 'preview', :with => "Form.serialize('issue-form')", diff --git a/app/views/journals/_notes_form.html.erb b/app/views/journals/_notes_form.html.erb index ef95f9df9..f1311ac3b 100644 --- a/app/views/journals/_notes_form.html.erb +++ b/app/views/journals/_notes_form.html.erb @@ -7,7 +7,7 @@ <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %> <p><%= submit_tag l(:button_save) %> <%= link_to_remote l(:label_preview), - { :url => preview_issue_path(:project_id => @project, :id => @journal.issue), + { :url => preview_edit_issue_path(:project_id => @project, :id => @journal.issue), :method => 'post', :update => "journal_#{@journal.id}_preview", :with => "Form.serialize('journal-#{@journal.id}-form')", diff --git a/config/routes.rb b/config/routes.rb index 583eff755..552ecb911 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,8 +44,10 @@ ActionController::Routing::Routes.draw do |map| map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues', :conditions => { :method => :get } # TODO: would look nicer as /issues/:id/preview - map.preview_issue '/issues/preview/:id', :controller => 'previews', - :action => 'issue' + map.preview_new_issue '/issues/preview/new/:project_id', :controller => 'previews', + :action => 'issue' + map.preview_edit_issue '/issues/preview/edit/:id', :controller => 'previews', + :action => 'issue' map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues' diff --git a/test/integration/routing/previews_test.rb b/test/integration/routing/previews_test.rb index 52799253d..9e280f16e 100644 --- a/test/integration/routing/previews_test.rb +++ b/test/integration/routing/previews_test.rb @@ -21,8 +21,12 @@ class RoutingPreviewsTest < ActionController::IntegrationTest def test_previews ["get", "post"].each do |method| assert_routing( - { :method => method, :path => "/issues/preview/123" }, - { :controller => 'previews', :action => 'issue', :id => '123' } + { :method => method, :path => "/issues/preview/new/123" }, + { :controller => 'previews', :action => 'issue', :project_id => '123' } + ) + assert_routing( + { :method => method, :path => "/issues/preview/edit/321" }, + { :controller => 'previews', :action => 'issue', :id => '321' } ) end assert_routing( |