cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update some more queries to use AREL in place of deprecated methods

Browse source
This commit is contained in:
Tom Hughes 2011-09-20 23:22:11 +01:00
parent 62e571a4aa
commit 8ae5d94b2f
16 changed files with 146 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/relation.rb
View file

@ -220,8 +220,7 @@ class Relation < ActiveRecord::Base
self.lock!
check_consistency(self, new_relation, user)
# This will check to see if this relation is used by another relation
rel = RelationMember.find(:first, :joins => :relation,
:conditions => [ "visible = ? AND member_type='Relation' and member_id=? ", true, self.id ])
rel = RelationMember.joins(:relation).where("visible = ? AND member_type = 'Relation' and member_id = ? ", true, self.id).first
raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is used in relation #{rel.relation.id}.") unless rel.nil?
self.changeset_id = new_relation.changeset_id
@ -279,7 +278,7 @@ class Relation < ActiveRecord::Base
# use reflection to look up the appropriate class
model = Kernel.const_get(m[0].capitalize)
# get the element with that ID
element = model.find(:first, :conditions =>["id = ?", m[1]])
element = model.where(:id => m[1]).first
# and check that it is OK to use.
unless element and element.visible? and element.preconditions_ok?