Merge branch 'master' into notes

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 45abdf474ded2175ca9b5cab15d519e9a00ed46f..bc47aa8e07acee587db1980276cfbdb43862724d 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,12 +1,13 @@
 class Trace < ActiveRecord::Base
-  set_table_name 'gpx_files'
+  self.table_name = "gpx_files"
 
-  belongs_to :user
+  belongs_to :user, :counter_cache => true
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
   has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all
 
   scope :visible, where(:visible => true)
   scope :visible_to, lambda { |u| visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
+  scope :public, where(:visibility => ["public", "identifiable"])
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create