Tell users if the reason they can't login is because they haven't activated

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 4f21c8b25e29277d3c167a55e860011232793693..97dcf963518327c516f8b607d733d7819a2c798a 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,9 +1,10 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
-  validates_presence_of :user_id, :name, :public, :description, :timestamp
+  validates_presence_of :user_id, :name, :timestamp
+  validates_presence_of :description, :on => :create
 #  validates_numericality_of :latitude, :longitude
-  validates_inclusion_of :inserted, :in => [ true, false]
+  validates_inclusion_of :public, :inserted, :in => [ true, false]
   
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
@@ -11,7 +12,13 @@ class Trace < ActiveRecord::Base
 
   def destroy
     super
-    FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)
+  end
+
+  def tagstring
+    return tags.collect {|tt| tt.tag}.join(" ")
   end
 
   def tagstring=(s)