kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: error on csv/pdf export and feeds (oracle)

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@556 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-05-29 22:20:43 +00:00
parent 97f6315bd0
commit 7fb03b1ca3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/feeds_controller.rb
View File

@ -92,7 +92,7 @@ private
# global feed # global feed
scope = ["#{Project.table_name}.is_public=?", true] scope = ["#{Project.table_name}.is_public=?", true]
end end
@find_options = {:conditions => scope, :limit => Setting.feeds_limit} @find_options = {:conditions => scope, :limit => Setting.feeds_limit.to_i}
return true return true
end end
end end

4
app/controllers/projects_controller.rb
View File

@ -297,7 +297,7 @@ class ProjectsController < ApplicationController
@issues = Issue.find :all, :order => sort_clause, @issues = Issue.find :all, :order => sort_clause,
:include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ], :include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
:conditions => @query.statement, :conditions => @query.statement,
:limit => Setting.issues_export_limit :limit => Setting.issues_export_limit.to_i
ic = Iconv.new(l(:general_csv_encoding), 'UTF-8') ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
export = StringIO.new export = StringIO.new
@ -356,7 +356,7 @@ class ProjectsController < ApplicationController
@issues = Issue.find :all, :order => sort_clause, @issues = Issue.find :all, :order => sort_clause,
:include => [ :author, :status, :tracker, :priority, :project, :custom_values ], :include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
:conditions => @query.statement, :conditions => @query.statement,
:limit => Setting.issues_export_limit :limit => Setting.issues_export_limit.to_i
@options_for_rfpdf ||= {} @options_for_rfpdf ||= {}
@options_for_rfpdf[:file_name] = "export.pdf" @options_for_rfpdf[:file_name] = "export.pdf"