Fixes broken CSV link on cross-project timelog report (#2941).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2582 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index 950b37dc13385449104ff25df6122843b07ae1e8..20cf8cea4085aca754266febd947b392199fe3f9 100644 (file)
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -9,7 +9,7 @@
 <% form_remote_tag( :url => {}, :html => {:method => :get}, :method => :get, :update => 'content' ) do %>\r
 <%# TOOD: remove the project_id and issue_id hidden fields, that information is\r
 already in the URI %>\r
-<%= hidden_field_tag 'project_id', params[:project_id] %>\r
+<%= hidden_field_tag('project_id', params[:project_id]) if @project %>\r
 <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>\r
 <%= render :partial => 'date_range' %>\r
 <% end %>\r

diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 6ff61ff751062d4a93d7a97bb0c0238b4f87ec4a..52bd11f4820898023d758ca1520415b02085999c 100644 (file)
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -11,7 +11,7 @@
     <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
   <% end %>
   <%# TODO: get rid of the project_id field, that should already be in the URL %>
-  <%= hidden_field_tag 'project_id', params[:project_id] %>
+  <%= hidden_field_tag('project_id', params[:project_id]) if @project %>
   <%= render :partial => 'date_range' %>
 
   <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],