Improve reporting of errors in GPX uploads, and allow private traces

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 11f912b693aa2f16977544ef3b7eacf63165cb9b..eccd3af1f9f8164a40ecd9507086d0b63dcbe143 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,10 +1,10 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 

-  validates_presence_of :user_id, :name, :public, :timestamp
+  validates_presence_of :user_id, :name, :timestamp

   validates_presence_of :description, :on => :create
 #  validates_numericality_of :latitude, :longitude
   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
   
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all


@@ -15,6 +15,10 @@ class Trace < ActiveRecord::Base
     FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
   end
 
     FileUtils.rm_f(trace_name, icon_picture_name, large_picture_name)
   end
 

+  def tagstring
+    return tags.collect {|tt| tt.tag}.join(" ")
+  end
+

   def tagstring=(s)
     self.tags = s.split().collect {|tag|
       tt = Tracetag.new
   def tagstring=(s)
     self.tags = s.split().collect {|tag|
       tt = Tracetag.new