summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-05 18:38:42 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-05 18:38:42 +0000
commit8509cf80f009436e900294acc821295f21e3b142 (patch)
tree37095d100c500b27cb2249dc3b7ece1198434637 /app/views
parent26a1ae4808368128f2cc8b348528506f358dab15 (diff)
downloadredmine-8509cf80f009436e900294acc821295f21e3b142.tar.gz
redmine-8509cf80f009436e900294acc821295f21e3b142.zip
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index
git-svn-id: http://redmine.rubyforge.org/svn/trunk@887 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/issues/_sidebar.rhtml4
-rw-r--r--app/views/issues/changes.rxml30
-rw-r--r--app/views/issues/context_menu.rhtml2
-rw-r--r--app/views/issues/index.rfpdf (renamed from app/views/projects/export_issues_pdf.rfpdf)97
-rw-r--r--app/views/issues/index.rhtml79
-rw-r--r--app/views/projects/list_issues.rhtml72
-rw-r--r--app/views/projects/roadmap.rhtml4
-rw-r--r--app/views/projects/show.rhtml4
-rw-r--r--app/views/queries/index.rhtml2
-rw-r--r--app/views/reports/_details.rhtml10
-rw-r--r--app/views/reports/_simple.rhtml8
11 files changed, 154 insertions, 158 deletions
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index b171dbd0b..3b42ce465 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -4,7 +4,7 @@
<% end %>
<h3><%= l(:label_issue_plural) %></h3>
-<%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %><br />
+<%= link_to l(:label_issue_view_all), { :set_filter => 1 } %><br />
<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
<%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
@@ -14,5 +14,5 @@
:order => "name ASC",
:conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
queries.each do |query| %>
-<%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %><br />
+<%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
<% end %>
diff --git a/app/views/issues/changes.rxml b/app/views/issues/changes.rxml
new file mode 100644
index 000000000..f1aa5d206
--- /dev/null
+++ b/app/views/issues/changes.rxml
@@ -0,0 +1,30 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+ xml.title @title
+ xml.link "rel" => "self", "href" => url_for(:controller => 'feeds', :action => 'history', :format => 'atom', :only_path => false)
+ xml.link "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
+ xml.id url_for(:controller => 'welcome', :only_path => false)
+ xml.updated((@changes.first ? @changes.first.event_datetime : Time.now).xmlschema)
+ xml.author { xml.name "#{Setting.app_title}" }
+ @changes.each do |change|
+ issue = change.issue
+ xml.entry do
+ xml.title "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
+ xml.link "rel" => "alternate", "href" => url_for(:controller => 'issues' , :action => 'show', :id => issue, :only_path => false)
+ xml.id url_for(:controller => 'issues' , :action => 'show', :id => issue, :journal_id => change, :only_path => false)
+ xml.updated change.created_on.xmlschema
+ xml.author do
+ xml.name change.user.name
+ xml.email(change.user.mail)
+ end
+ xml.content "type" => "html" do
+ xml.text! '<ul>'
+ change.details.each do |detail|
+ xml.text! '<li>' + show_detail(detail, false) + '</li>'
+ end
+ xml.text! '</ul>'
+ xml.text! textilizable(change.notes) unless change.notes.blank?
+ end
+ end
+ end
+end \ No newline at end of file
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 798fd42c3..e44911daf 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -1,4 +1,4 @@
-<% back_to = url_for(:controller => 'projects', :action => 'list_issues', :id => @project) %>
+<% back_to = url_for(:controller => 'issues', :action => 'index', :project_id => @project) %>
<ul>
<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
:class => 'icon-edit', :disabled => !@can[:edit] %></li>
diff --git a/app/views/projects/export_issues_pdf.rfpdf b/app/views/issues/index.rfpdf
index d782c54b0..d5a8d3c31 100644
--- a/app/views/projects/export_issues_pdf.rfpdf
+++ b/app/views/issues/index.rfpdf
@@ -1,49 +1,50 @@
-<% pdf=IfpdfHelper::IFPDF.new(current_language)
- pdf.SetTitle("#{@project.name} - #{l(:label_issue_plural)}")
- pdf.AliasNbPages
- pdf.footer_date = format_date(Date.today)
- pdf.AddPage("L")
- row_height = 7
-
- #
- # title
- #
- pdf.SetFontStyle('B',11)
- pdf.Cell(190,10, "#{@project.name} - #{l(:label_issue_plural)}")
- pdf.Ln
-
- #
- # headers
- #
- pdf.SetFontStyle('B',10)
- pdf.SetFillColor(230, 230, 230)
- pdf.Cell(15, row_height, "#", 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_tracker), 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_status), 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_priority), 0, 0, 'L', 1)
- pdf.Cell(40, row_height, l(:field_author), 0, 0, 'L', 1)
- pdf.Cell(25, row_height, l(:field_updated_on), 0, 0, 'L', 1)
- pdf.Cell(0, row_height, l(:field_subject), 0, 0, 'L', 1)
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.Ln
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.SetY(pdf.GetY() + 1)
-
- #
- # rows
- #
- pdf.SetFontStyle('',9)
- pdf.SetFillColor(255, 255, 255)
- @issues.each do |issue|
- pdf.Cell(15, row_height, issue.id.to_s, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.tracker.name, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.status.name, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)
- pdf.Cell(40, row_height, issue.author.name, 0, 0, 'L', 1)
- pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)
- pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.SetY(pdf.GetY() + 1)
- end
-%>
+<% pdf=IfpdfHelper::IFPDF.new(current_language)
+ title = @project ? "#{@project.name} - #{l(:label_issue_plural)}" : "#{l(:label_issue_plural)}"
+ pdf.SetTitle(title)
+ pdf.AliasNbPages
+ pdf.footer_date = format_date(Date.today)
+ pdf.AddPage("L")
+ row_height = 7
+
+ #
+ # title
+ #
+ pdf.SetFontStyle('B',11)
+ pdf.Cell(190,10, title)
+ pdf.Ln
+
+ #
+ # headers
+ #
+ pdf.SetFontStyle('B',10)
+ pdf.SetFillColor(230, 230, 230)
+ pdf.Cell(15, row_height, "#", 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, l(:field_tracker), 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, l(:field_status), 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, l(:field_priority), 0, 0, 'L', 1)
+ pdf.Cell(40, row_height, l(:field_assigned_to), 0, 0, 'L', 1)
+ pdf.Cell(25, row_height, l(:field_updated_on), 0, 0, 'L', 1)
+ pdf.Cell(0, row_height, l(:field_subject), 0, 0, 'L', 1)
+ pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+ pdf.Ln
+ pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+ pdf.SetY(pdf.GetY() + 1)
+
+ #
+ # rows
+ #
+ pdf.SetFontStyle('',9)
+ pdf.SetFillColor(255, 255, 255)
+ @issues.each do |issue|
+ pdf.Cell(15, row_height, issue.id.to_s, 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, issue.tracker.name, 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, issue.status.name, 0, 0, 'L', 1)
+ pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)
+ pdf.Cell(40, row_height, issue.assigned_to ? issue.assigned_to.name : '', 0, 0, 'L', 1)
+ pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)
+ pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))
+ pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+ pdf.SetY(pdf.GetY() + 1)
+ end
+%>
<%= pdf.Output %> \ No newline at end of file
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index eb0835357..81c59ca55 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -1,35 +1,72 @@
-<h2><%=l(:label_issue_plural)%></h2>
+<% if @query.new_record? %>
+ <h2><%=l(:label_issue_plural)%></h2>
+ <% set_html_title l(:label_issue_plural) %>
-<% form_tag({}, :id => 'query_form') do %>
-<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+ <% form_tag({ :controller => 'queries', :action => 'new', :project_id => @project }, :id => 'query_form') do %>
+ <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+ <div class="contextual">
+ <%= link_to_remote l(:button_apply),
+ { :url => { :set_filter => 1 },
+ :update => "content",
+ :with => "Form.serialize('query_form')"
+ }, :class => 'icon icon-edit' %>
+
+ <%= link_to_remote l(:button_clear),
+ { :url => { :set_filter => 1 },
+ :update => "content",
+ }, :class => 'icon icon-reload' %>
+
+ <% if current_role && current_role.allowed_to?(:save_queries) %>
+ <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
+ <% end %>
+ </div>
+ <br />
+ &nbsp;
+ <% end %>
+<% else %>
+ <div class="contextual">
+ <% if @query.editable_by?(User.current) %>
+ <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
+ <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+ <% end %>
+ </div>
+
+ <h2><%= @query.name %></h2>
+ <div id="query_form"></div>
+ <% set_html_title @query.name %>
<% end %>
-<div class="contextual">
-<%= link_to_remote l(:button_apply),
- { :url => { :set_filter => 1 },
- :update => "content",
- :with => "Form.serialize('query_form')"
- }, :class => 'icon icon-edit' %>
-
-<%= link_to_remote l(:button_clear),
- { :url => { :set_filter => 1 },
- :update => "content",
- }, :class => 'icon icon-reload' %>
-</div>
-<br />&nbsp;
-
<%= error_messages_for 'query' %>
<% if @query.valid? %>
<% if @issues.empty? %>
-<p><i><%= l(:label_no_data) %></i></p>
+<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
-&nbsp;
+<% form_tag({:controller => 'projects', :action => 'bulk_edit_issues', :id => @project}, :id => 'issues_form', :onsubmit => "if (!checkBulkEdit(this)) {alert('#{l(:notice_no_issue_selected)}'); return false;}" ) do %>
<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-
+<div class="contextual">
+<%= l(:label_export_to) %>
+<%= link_to 'CSV', {:format => 'csv'}, :class => 'icon icon-csv' %>,
+<%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
+</div>
<p><%= pagination_links_full @issue_pages %>
[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
<% end %>
<% end %>
+<% end %>
+
+<% content_for :sidebar do %>
+ <%= render :partial => 'issues/sidebar' %>
+<% end if @project%>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+ <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
+ <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+ <%= javascript_include_tag 'calendar/calendar' %>
+ <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
+ <%= javascript_include_tag 'calendar/calendar-setup' %>
+ <%= stylesheet_link_tag 'calendar' %>
+ <%= javascript_include_tag 'context_menu' %>
+ <%= stylesheet_link_tag 'context_menu' %>
<% end %>
+
+<div id="context-menu" style="display: none;"></div>
+<%= javascript_tag 'new ContextMenu({})' %>
diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
deleted file mode 100644
index 0c0aaa418..000000000
--- a/app/views/projects/list_issues.rhtml
+++ /dev/null
@@ -1,72 +0,0 @@
-<% if @query.new_record? %>
- <h2><%=l(:label_issue_plural)%></h2>
- <% set_html_title l(:label_issue_plural) %>
-
- <% form_tag({ :controller => 'queries', :action => 'new', :project_id => @project }, :id => 'query_form') do %>
- <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
- <div class="contextual">
- <%= link_to_remote l(:button_apply),
- { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
- :update => "content",
- :with => "Form.serialize('query_form')"
- }, :class => 'icon icon-edit' %>
-
- <%= link_to_remote l(:button_clear),
- { :url => {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1},
- :update => "content",
- }, :class => 'icon icon-reload' %>
-
- <% if current_role.allowed_to?(:save_queries) %>
- <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
- <% end %>
- </div>
- <br />
- &nbsp;
- <% end %>
-<% else %>
- <div class="contextual">
- <% if @query.editable_by?(User.current) %>
- <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
- <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
- <% end %>
- </div>
-
- <h2><%= @query.name %></h2>
- <div id="query_form"></div>
- <% set_html_title @query.name %>
-<% end %>
-<%= error_messages_for 'query' %>
-<% if @query.valid? %>
-<% if @issues.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<% form_tag({:controller => 'projects', :action => 'bulk_edit_issues', :id => @project}, :id => 'issues_form', :onsubmit => "if (!checkBulkEdit(this)) {alert('#{l(:notice_no_issue_selected)}'); return false;}" ) do %>
-<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
-<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
-</div>
-<p>
-<%= pagination_links_full @issue_pages %>
-[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
-</p>
-<% end %>
-<% end %>
-<% end %>
-
-<% content_for :sidebar do %>
- <%= render :partial => 'issues/sidebar' %>
-<% end %>
-
-<% content_for :header_tags do %>
- <%= javascript_include_tag 'calendar/calendar' %>
- <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
- <%= javascript_include_tag 'calendar/calendar-setup' %>
- <%= stylesheet_link_tag 'calendar' %>
- <%= javascript_include_tag 'context_menu' %>
- <%= stylesheet_link_tag 'context_menu' %>
-<% end %>
-
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag 'new ContextMenu({})' %>
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 8d681657e..d45bc207c 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -34,8 +34,8 @@
<% end %>
</tr>
</table>
- <em><%= link_to(complete, :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%) &#160;
- <%= link_to((total - complete), :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em>
+ <em><%= link_to(complete, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%) &#160;
+ <%= link_to((total - complete), :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em>
<br />
<br />
<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 25fbe3c68..88178cb5d 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -22,14 +22,14 @@
<h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
<ul>
<% for tracker in @trackers %>
- <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
+ <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
:set_filter => 1,
"tracker_id" => tracker.id %>:
<%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
<%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
<% end %>
</ul>
- <p><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></p>
+ <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
</div>
<% end %>
</div>
diff --git a/app/views/queries/index.rhtml b/app/views/queries/index.rhtml
index 71aa37497..1c608b8ac 100644
--- a/app/views/queries/index.rhtml
+++ b/app/views/queries/index.rhtml
@@ -11,7 +11,7 @@
<% @queries.each do |query| %>
<tr class="<%= cycle('odd', 'even') %>">
<td>
- <%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %>
+ <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
</td>
<td align="right">
<small>
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index af8807fbd..c3ad2bed7 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -15,28 +15,28 @@
<tbody>
<% for row in rows %>
<tr class="<%= cycle("odd", "even") %>">
- <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id %></td>
<% for status in @statuses %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"status_id" => status.id,
"#{field_name}" => row.id %></td>
<% end %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "*" %></td>
diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 8b5a7fe47..7f799f325 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -11,21 +11,21 @@
<tbody>
<% for row in rows %>
<tr class="<%= cycle("odd", "even") %>">
- <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id },
- :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
+ :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
"#{field_name}" => row.id,
"status_id" => "*" %></td>