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

Updated dmsf_file model with Rails3 alternative to merge_conditions. Fixes #2

Browse Source
This commit is contained in:
Daniel Munn 2012-06-12 16:53:04 +01:00
parent 8828594698
commit 36fa608cc1
1 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/dmsf_file.rb
View File

@ -350,8 +350,7 @@ class DmsfFile < ActiveRecord::Base
next if dmsf_attrs[1].blank? next if dmsf_attrs[1].blank?
next unless results.select{|f| f.id.to_s == dmsf_attrs[1]}.empty? 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.where(limit_options[:conditions]).where(:id => dmsf_attrs[1], :deleted => false).first
dmsf_file = DmsfFile.find(:first, :conditions => find_conditions )
if !dmsf_file.nil? if !dmsf_file.nil?
if options[:offset] if options[:offset]