From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 Aug 2007 09:16:33 +0000 (+0000)
Subject: Move tag validation to the right place.
X-Git-Tag: live~8206
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9861ca8001769b7cced2c8b5bcc0a87896f5439e?ds=sidebyside

Move tag validation to the right place.
---

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 7d4f01dad..c189c035e 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -3,7 +3,6 @@ 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]
   
diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index d74a1e75a..f1d5967d5 100644
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,6 +1,7 @@
 class Tracetag < ActiveRecord::Base
   set_table_name 'gpx_file_tags'
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates_format_of :tag, :with => /^[^\/;.,?]*$/
 
+  belongs_to :trace, :foreign_key => 'gpx_id'
 end