jro_apps/redmine Commit - r8766:84dd4ecbd4a0

route: split issue preview route to adding and editing...

Toshi MARUYAMA -

r8766:84dd4ecbd4a0

parent child

Context file:

r8766:84dd4ecbd4a0

app/views/issues/_edit.html.erb +1 -1

                 <%= 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")',

app/views/issues/new.html.erb +1 -1

                 <%= 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')",

app/views/journals/_notes_form.html.erb +1 -1

                 <%= 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')",

config/routes.rb +4 -2

               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',
+              map.preview_new_issue '/issues/preview/new/:project_id', :controller => 'previews',
-                                :action => 'issue'
+                                    :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'

test/integration/routing/previews_test.rb +6 -2

               def test_previews
                 ["get", "post"].each do |method|
                   assert_routing(
-                      { :method => method, :path => "/issues/preview/123" },
+                      { :method => method, :path => "/issues/preview/new/123" },
-                      { :controller => 'previews', :action => 'issue', :id => '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(

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages