internal 500 error : 1.5.1 stable with redmine 3.0.1 when search in dmsf enabled project #373
This commit is contained in:
parent
48d83d571f
commit
89b95f0c72
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user