jro_apps/redmine Commit - r10847:4ac43ab87631

Code cleanup, use named routes....

Jean-Philippe Lang -

r10847:4ac43ab87631

parent child

Context file:

r10847:4ac43ab87631

Collapse all files

app/helpers/reports_helper.rb +5 0

                 a = aggregate data, criteria
                 a > 0 ? link_to(h(a), *args) : '-'
               end
+              def aggregate_path(project, field, row, options={})
+                parameters = {:set_filter => 1, :subproject_id => '!*', field => row.id}.merge(options)
+                project_issues_path(row.is_a?(Project) ? row : project, parameters)
+              end
             end

app/helpers/routes_helper.rb +8 0

@@ -28,4 +28,12 module RoutesHelper
28	issues_path(*args)	28	issues_path(*args)
29	end	29	end
30	end	30	end
		31
		32	def _project_calendar_path(project, *args)
		33	project ? project_calendar_path(project, args) : issues_calendar_path(args)
		34	end
		35
		36	def _project_gantt_path(project, *args)
		37	project ? project_gantt_path(project, args) : issues_gantt_path(args)
		38	end
31	end	39	end

app/views/issues/_sidebar.html.erb +4 -4

             <h3><%= l(:label_issue_plural) %></h3>
-            <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
+            <%= link_to l(:label_issue_view_all), _project_issues_path(@project, :set_filter => 1) %><br />
             <% if @project %>
-            <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
+            <%= link_to l(:field_summary), project_issues_report_path(@project) %><br />
             <% end %>
             <%= call_hook(:view_issues_sidebar_issues_bottom) %>
             <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
-              <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %><br />
+              <%= link_to l(:label_calendar), _project_calendar_path(@project) %><br />
             <% end %>
             <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
-              <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %><br />
+              <%= link_to l(:label_gantt), _project_gantt_path(@project) %><br />
             <% end %>
             <%= call_hook(:view_issues_sidebar_planning_bottom) %>

app/views/reports/_details.html.erb +5 -28

@@ -15,36 +15,13
15	<tbody>	15	<tbody>
16	<% for row in rows %>	16	<% for row in rows %>
17	<tr class="<%= cycle("odd", "even") %>">	17	<tr class="<%= cycle("odd", "even") %>">
18	<td><%= link_to h(row.name), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),	18	<td><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td>
19	:set_filter => 1,
20	:subproject_id => '!*',
21	"#{field_name}" => row.id %></td>
22	<% for status in @statuses %>	19	<% for status in @statuses %>
23	<td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },	20	<td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td>
24	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
25	:set_filter => 1,
26	:subproject_id => '!*',
27	"status_id" => status.id,
28	"#{field_name}" => row.id %></td>
29	<% end %>	21	<% end %>
30	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },	22	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
31	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),	23	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
32	:set_filter => 1,	24	<td align="center"><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td>
33	:subproject_id => '!*',
34	"#{field_name}" => row.id,
35	"status_id" => "o" %></td>
36	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
37	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
38	:set_filter => 1,
39	:subproject_id => '!*',
40	"#{field_name}" => row.id,
41	"status_id" => "c" %></td>
42	<td align="center"><%= aggregate_link data, { field_name => row.id },
43	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
44	:set_filter => 1,
45	:subproject_id => '!*',
46	"#{field_name}" => row.id,
47	"status_id" => "*" %></td>
48	</tr>	25	</tr>
49	<% end %>	26	<% end %>
50	</tbody>	27	</tbody>

app/views/reports/_simple.html.erb +4 -22

@@ -11,28 +11,10
11	<tbody>	11	<tbody>
12	<% for row in rows %>	12	<% for row in rows %>
13	<tr class="<%= cycle("odd", "even") %>">	13	<tr class="<%= cycle("odd", "even") %>">
14	<td><%= link_to h(row.name), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),	14	<td><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td>
15	:set_filter => 1,	15	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
16	:subproject_id => '!*',	16	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
17	"#{field_name}" => row.id %></td>	17	<td align="center"><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td>
18	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
19	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
20	:set_filter => 1,
21	:subproject_id => '!*',
22	"#{field_name}" => row.id,
23	"status_id" => "o" %></td>
24	<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
25	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
26	:set_filter => 1,
27	:subproject_id => '!*',
28	"#{field_name}" => row.id,
29	"status_id" => "c" %></td>
30	<td align="center"><%= aggregate_link data, { field_name => row.id },
31	:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
32	:set_filter => 1,
33	:subproject_id => '!*',
34	"#{field_name}" => row.id,
35	"status_id" => "*" %></td>
36	</tr>	18	</tr>
37	<% end %>	19	<% end %>
38	</tbody>	20	</tbody>

app/views/reports/issue_report.html.erb +7 -7

             <h2><%=l(:label_report_plural)%></h2>
             <div class="splitcontentleft">
-            <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'tracker' %></h3>
+            <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'tracker') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
             <br />
-            <h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'priority' %></h3>
+            <h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'priority') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
             <br />
-            <h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'assigned_to' %></h3>
+            <h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'assigned_to') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>
             <br />
-            <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'author' %></h3>
+            <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'author') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
             <br />
             <%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
             </div>
             <div class="splitcontentright">
-            <h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'version' %></h3>
+            <h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'version') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
             <br />
             <% if @project.children.any? %>
-            <h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'subproject' %></h3>
+            <h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'subproject') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %>
             <br />
             <% end %>
-            <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'category' %></h3>
+            <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'category') %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
             <br />
             <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>

app/views/reports/issue_report_details.html.erb +1 -1

             <h3><%=@report_title%></h3>
             <%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>
             <br />
-            <%= link_to l(:button_back), :action => 'issue_report' %>
+            <%= link_to l(:button_back), project_issues_report_path(@project) %>

config/routes.rb +2 -2

               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
-              match 'projects/:id/issues/report', :to => 'reports#issue_report', :via => :get
+              get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
-              match 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :via => :get
+              get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]

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