redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fixed Issue 168: MySQL Error in serarching within dmsf files.

Browse Source 
git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@260 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-10-13 20:17:16 +00:00
parent 00f6676756
commit 02c6eb5a36
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/dmsf_file.rb
View File

@ -248,7 +248,7 @@ class DmsfFile < ActiveRecord::Base
project_conditions = []
project_conditions << (Project.allowed_to_condition(User.current, :view_dmsf_files))
project_conditions << "project_id IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
project_conditions << "#{DmsfFile.table_name}.project_id IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
results = []
results_count = 0
@ -305,7 +305,7 @@ class DmsfFile < ActiveRecord::Base
next unless results.select{|f| f.id.to_s == dmsf_attrs[1]}.empty?
find_conditions = DmsfFile.merge_conditions(limit_options[:conditions], :id => dmsf_attrs[1], :deleted => false )
dmsf_file = DmsfFile.find(:first, :conditions => find_conditions )
dmsf_file = DmsfFile.find(:first, :conditions => find_conditions )
if !dmsf_file.nil?
if options[:offset]