From 89b95f0c722f82a4d5c91425764613056c702a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Fri, 24 Apr 2015 14:46:15 +0200 Subject: [PATCH] internal 500 error : 1.5.1 stable with redmine 3.0.1 when search in dmsf enabled project #373 --- app/models/dmsf_file.rb | 2 +- app/models/dmsf_folder.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index d6ece1f6..d4336258 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -323,7 +323,7 @@ class DmsfFile < ActiveRecord::Base joins(:project, :revisions). where(project_conditions.join(' AND ') + " AND #{DmsfFile.table_name}.deleted = :false", {:false => false}).scoping do where(find_options[:conditions]).order(find_options[:order]).scoping do - results_count = count(:all) + results_count = count results = where(limit_options) end end diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 3093699e..b0a73eff 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -312,7 +312,7 @@ class DmsfFolder < ActiveRecord::Base joins(:project). where(project_conditions.join(' AND ')).scoping do where(find_options[:conditions]).order(find_options[:order]).scoping do - results_count = count(:all) + results_count = count results = where(limit_options) end end