diff --git a/app/views/hooks/different_formats/_view_issues_sidebar_issues_bottom.rhtml b/app/views/hooks/different_formats/_view_issues_sidebar_issues_bottom.rhtml index 9b36c7640a..96b61eb910 100644 --- a/app/views/hooks/different_formats/_view_issues_sidebar_issues_bottom.rhtml +++ b/app/views/hooks/different_formats/_view_issues_sidebar_issues_bottom.rhtml @@ -1,5 +1,5 @@

<%= l(:different_formats) %>

-<% if params[:action] == "index" %> +<% if params[:action] == "index" or params[:action] == "all" %> <%= link_to l(:print_with_description), :controller => 'issues', :action => 'printable', :project_id => @project %>
<%= link_to l(:export_to_excel), :controller => 'issues', :action => 'index', :format => 'xls', :project_id => @project %>
<% end %> diff --git a/app/views/hooks/printable_issues/_view_issues_sidebar_issues_bottom.rhtml b/app/views/hooks/printable_issues/_view_issues_sidebar_issues_bottom.rhtml index 61c5aefb15..43036bb6b3 100644 --- a/app/views/hooks/printable_issues/_view_issues_sidebar_issues_bottom.rhtml +++ b/app/views/hooks/printable_issues/_view_issues_sidebar_issues_bottom.rhtml @@ -1,3 +1,3 @@ -<% if params[:action] == "index" %> +<% if params[:action] == "index" or params[:action] == "all" %> <%= link_to l(:print_with_description), :controller => 'issues', :action => 'printable', :project_id => @project %>
-<% end %> \ No newline at end of file +<% end %> diff --git a/lib/xls_report/cost_reports_controller_patch.rb b/lib/xls_report/cost_reports_controller_patch.rb index 43d77f1499..5ded377efd 100644 --- a/lib/xls_report/cost_reports_controller_patch.rb +++ b/lib/xls_report/cost_reports_controller_patch.rb @@ -18,7 +18,7 @@ if require_dependency 'cost_reports_controller' module InstanceMethods def excel_export? - params["action"] == "index" && params["format"] == "xls" + (params["action"] == "index" or params[:action] == "all") && params["format"] == "xls" end def ensure_project_scope_with_excel_export? diff --git a/lib/xls_report/issues_controller_patch.rb b/lib/xls_report/issues_controller_patch.rb index fab7535c22..d69ad43d9a 100644 --- a/lib/xls_report/issues_controller_patch.rb +++ b/lib/xls_report/issues_controller_patch.rb @@ -6,17 +6,17 @@ module XlsReport module IssuesControllerPatch def self.included(base) # :nodoc: base.send(:include, InstanceMethods) - + base.class_eval do unloadable end end - + module InstanceMethods - + # If the index action is called, hook the xls format into the issues controller def respond_to(&block) - if (params["action"].to_sym == :index && params["format"].to_s.downcase == "xls") + if ((params["action"].to_sym == :index or params[:action] == "all") && params["format"].to_s.downcase == "xls") super do |format| yield format format.xls do