jro_apps/redmine Commit - r3927:56e984b5e740

Refactor: convert many of the custom Issue routes to REST resources....

Eric Davis -

r3927:56e984b5e740

parent child

Context file:

r3927:56e984b5e740

Collapse all files

app/controllers/calendars_controller.rb +4 -1

                   @calendar.events = events
                 end
-                render :layout => false if request.xhr?
+                render :action => 'show', :layout => false if request.xhr?
               end
+              def update
+                show
+              end
             end

app/controllers/gantts_controller.rb +4 0

                 end
               end
+              def update
+                show
+              end
             end

app/views/calendars/show.html.erb +2 -1

             <h2><%= l(:label_calendar) %></h2>
-            <% form_tag({}, :id => 'query_form') do %>
+            <% form_tag(calendar_path, :method => :put, :id => 'query_form') do %>
+              <%= hidden_field_tag('project_id', @project.to_param) if @project%>
             <fieldset id="filters" class="collapsible">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div>

app/views/gantts/show.html.erb +2 -1

             <h2><%= l(:label_gantt) %></h2>
-            <% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %>
+            <% form_tag(gantt_path(:month => params[:month], :year => params[:year], :months => params[:months]), :method => :put, :id => 'query_form') do %>
+              <%= hidden_field_tag('project_id', @project.to_param) if @project%>
             <fieldset id="filters" class="collapsible">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
             	<div>

config/routes.rb +24 -42

@@ -104,58 +104,39 ActionController::Routing::Routes.draw do \|map\|
104	end	104	end
105		105
106	map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'	106	map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
		107
		108	# Misc issue routes. TODO: move into resources
107	map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'	109	map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
108	# TODO: would look nicer as /issues/:id/preview	110	map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
109	map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue'
110	map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'	111	map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
111	map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'	112	map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
112		113	map.bulk_edit_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_edit', :conditions => { :method => :get }
113	map.with_options :controller => 'issues' do \|issues_routes\|	114	map.bulk_update_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_update', :conditions => { :method => :post }
114	issues_routes.with_options :conditions => {:method => :get} do \|issues_views\|	115	map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
115	issues_views.connect 'issues', :action => 'index'	116	map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
116	issues_views.connect 'issues.:format', :action => 'index'	117
117	issues_views.connect 'projects/:project_id/issues', :action => 'index'	118	map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update]
118	issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'	119	map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update]
119	issues_views.connect 'projects/:project_id/issues/new', :action => 'new'	120	map.resource :calendar, :path_prefix => '/issues', :controller => 'calendars', :only => [:show, :update]
120	~~issues_views~~.c~~onn~~ect 'projects/:project_id/issues~~/gantt~~', :controller => '~~gantt~~s', :~~acti~~on => ~~'show'~~	121	map.resource :calendar, :path_prefix => '/projects/:project_id/issues', :controller => 'calendars', :only => [:show, :update]
121	issues_views.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show'	122
122	issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'	123	map.with_options :controller => 'reports', :conditions => {:method => :get} do \|reports\|
123	issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/	124	reports.connect 'projects/:id/issues/report', :action => 'issue_report'
124	issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/	125	reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
125	issues_views.connect 'issues/:id/edit', :action => 'edit', :id => /\d+/
126	end
127	issues_routes.with_options :conditions => {:method => :post} do \|issues_actions\|
128	issues_actions.connect 'issues', :action => 'index'
129	issues_actions.connect 'projects/:project_id/issues', :action => 'create'
130	issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
131	issues_actions.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show'
132	issues_actions.connect 'issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/
133	issues_actions.connect 'issues/:id/:action', :action => /edit\|destroy/, :id => /\d+/
134	issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
135	issues_actions.connect 'issues/bulk_edit', :action => 'bulk_update'
136	end
137	issues_routes.with_options :conditions => {:method => :put} do \|issues_actions\|
138	issues_actions.connect 'issues/:id/edit', :action => 'update', :id => /\d+/
139	issues_actions.connect 'issues/:id.:format', :action => 'update', :id => /\d+/, :format => /xml/
140	end
141	issues_routes.with_options :conditions => {:method => :delete} do \|issues_actions\|
142	issues_actions.connect 'issues/:id.:format', :action => 'destroy', :id => /\d+/, :format => /xml/
143	end
144	issues_routes.connect 'issues/gantt', :controller => 'gantts', :action => 'show'
145	issues_routes.connect 'issues/calendar', :controller => 'calendars', :action => 'show'
146	issues_routes.connect 'issues/:action'
147	end	126	end
148		127
		128	# Following two routes conflict with the resources because #index allows POST
		129	map.connect '/issues', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
		130	map.connect '/issues/create', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
		131
		132	map.resources :issues, :member => { :edit => :post }, :collection => {}
		133	map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post }
		134
149	map.with_options :controller => 'issue_relations', :conditions => {:method => :post} do \|relations\|	135	map.with_options :controller => 'issue_relations', :conditions => {:method => :post} do \|relations\|
150	relations.connect 'issues/:issue_id/relations/:id', :action => 'new'	136	relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
151	relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'	137	relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
152	end	138	end
153		139
154	map.with_options :controller => 'reports', :conditions => {:method => :get} do \|reports\|
155	reports.connect 'projects/:id/issues/report', :action => 'issue_report'
156	reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
157	end
158
159	map.with_options :controller => 'news' do \|news_routes\|	140	map.with_options :controller => 'news' do \|news_routes\|
160	news_routes.with_options :conditions => {:method => :get} do \|news_views\|	141	news_routes.with_options :conditions => {:method => :get} do \|news_views\|
161	news_views.connect 'news', :action => 'index'	142	news_views.connect 'news', :action => 'index'
@@ -203,6 +184,7 ActionController::Routing::Routes.draw do \|map\|
203	project_views.connect 'projects/:id/files', :action => 'list_files'	184	project_views.connect 'projects/:id/files', :action => 'list_files'
204	project_views.connect 'projects/:id/files/new', :action => 'add_file'	185	project_views.connect 'projects/:id/files/new', :action => 'add_file'
205	project_views.connect 'projects/:id/settings/:tab', :action => 'settings'	186	project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
		187	project_views.connect 'projects/:project_id/issues/:copy_from/copy', :controller => 'issues', :action => 'new'
206	end	188	end
207		189
208	projects.with_options :action => 'activity', :conditions => {:method => :get} do \|activity\|	190	projects.with_options :action => 'activity', :conditions => {:method => :get} do \|activity\|

lib/redmine.rb +2 -2

               end
               map.project_module :calendar do |map|
-                map.permission :view_calendar, :calendars => :show
+                map.permission :view_calendar, :calendars => [:show, :update]
               end
               map.project_module :gantt do |map|
-                map.permission :view_gantt, :gantts => :show
+                map.permission :view_gantt, :gantts => [:show, :update]
               end
             end

test/functional/context_menus_controller_test.rb +1 -1

                                         :attributes => { :href => '/issues/1/edit',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
-                                        :attributes => { :href => '/issues/1/edit?issue%5Bstatus_id%5D=5',
+                                        :attributes => { :href => '/issues/1?issue%5Bstatus_id%5D=5',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8',

test/integration/issues_test.rb +1 -1

                 log_user('jsmith', 'jsmith')
                 set_tmp_attachments_directory
-                put 'issues/1/edit',
+                put 'issues/1',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
                 assert_redirected_to "issues/1"

test/integration/routing_test.rb +4 -4

                 should_route :post, "/issues/1/quoted", :controller => 'journals', :action => 'new', :id => '1'
                 should_route :get, "/issues/calendar", :controller => 'calendars', :action => 'show'
-                should_route :post, "/issues/calendar", :controller => 'calendars', :action => 'show'
+                should_route :put, "/issues/calendar", :controller => 'calendars', :action => 'update'
                 should_route :get, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'show', :project_id => 'project-name'
-                should_route :post, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'show', :project_id => 'project-name'
+                should_route :put, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'update', :project_id => 'project-name'
                 should_route :get, "/issues/gantt", :controller => 'gantts', :action => 'show'
-                should_route :post, "/issues/gantt", :controller => 'gantts', :action => 'show'
+                should_route :put, "/issues/gantt", :controller => 'gantts', :action => 'update'
                 should_route :get, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
-                should_route :post, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
+                should_route :put, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'update', :project_id => 'project-name'
                 should_route :get, "/issues/auto_complete", :controller => 'auto_completes', :action => 'issues'

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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