Update to iD v2.9.2

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 036f2fdc478692bc4f52b17ea8ed8f8aaf42d1f1..de5529e025bdbc042c02678a43880fd73d18ca67 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,6 +75,11 @@ class User < ActiveRecord::Base
 
   has_many :roles, :class_name => "UserRole"
 
+  has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id
+  has_many :issue_comments
+
+  has_many :reports
+
   scope :visible, -> { where(:status => %w[pending active confirmed]) }
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
@@ -206,7 +211,7 @@ class User < ActiveRecord::Base
                    .where("id != ?", id)
                    .where(sql_for_area)
                    .where("#{sql_for_distance} <= ?", radius)
-                   .order(sql_for_distance)
+                   .order(Arel.sql(sql_for_distance))
                    .limit(num)
     else
       nearby = []