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

git-svn-id: http://redmine.rubyforge.org/svn/trunk@556 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 214f80c952e5dce2d56a57c9ac95f4de2b1b56ff..bf03acbc9722d0e44f917d8db421ad7663153e44 100644 (file)
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -92,7 +92,7 @@ private
       # global feed
       scope = ["#{Project.table_name}.is_public=?", true]
     end
-    @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
+    @find_options = {:conditions => scope, :limit => Setting.feeds_limit.to_i}
     return true
   end
 end

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1de3788ac70f3b18ad194ba788ad69c63ce36924..0dc6cba26e1f8b875e7209a4d3970567298bd997 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -297,7 +297,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
                                                :include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
                                                :conditions => @query.statement,
-                                               :limit => Setting.issues_export_limit
+                                               :limit => Setting.issues_export_limit.to_i
 
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     export = StringIO.new
@@ -356,7 +356,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
                                                :include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
                                                :conditions => @query.statement,
-                                               :limit => Setting.issues_export_limit
+                                               :limit => Setting.issues_export_limit.to_i
                                                                                        
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"