X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/30f740178f9dcae12e577229555471428df77b5e..7dbb746fde5b00efe6d1395b5efab09bed97af1c:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 8f99e7bd8..7d4f01dad 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -3,6 +3,7 @@ class Trace < ActiveRecord::Base
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create
+  validates_format_of :tagstring, :with => /^[^\/;.,?]*$/
 #  validates_numericality_of :latitude, :longitude
   validates_inclusion_of :public, :inserted, :in => [ true, false]
   
@@ -188,7 +189,6 @@ class Trace < ActiveRecord::Base
         tp.lng = point['longitude'].to_f
         tp.altitude = point['altitude'].to_f
         tp.timestamp = point['timestamp']
-        tp.user_id = user.id
         tp.gpx_id = id
         tp.trackid = point['segment'].to_i
         tp.save!
@@ -211,7 +211,7 @@ class Trace < ActiveRecord::Base
         self.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon)
         self.size = gpx.actual_points
         self.inserted = true
-        self.save
+        self.save!
       end
 
       logger.info "done trace #{id}"