X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c2f23fea6a7821a4ad4c97fd65744b138ec86267..5cd417f8e8b09712892f8da64ead32bd59eef5d1:/app/models/trace.rb diff --git a/app/models/trace.rb b/app/models/trace.rb index 0e8180550..1d0b11d43 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -2,18 +2,17 @@ # # Table name: gpx_files # -# id :bigint(8) not null, primary key -# user_id :bigint(8) not null +# id :integer not null, primary key +# user_id :integer not null # visible :boolean default(TRUE), not null # name :string default(""), not null -# size :bigint(8) +# size :integer # latitude :float # longitude :float # timestamp :datetime not null # description :string default(""), not null # inserted :boolean not null # visibility :enum default("public"), not null -# length :bigint(8) # # Indexes # @@ -39,9 +38,8 @@ class Trace < ActiveRecord::Base scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) } validates :user, :presence => true, :associated => true - validates :name, :presence => true, :length => 1..255 - validates :name, :description, :invalid_chars => true - validates :description, :presence => { :on => :create }, :length => 1..255 + validates :name, :presence => true, :length => 1..255, :characters => true + validates :description, :presence => { :on => :create }, :length => 1..255, :characters => true validates :timestamp, :presence => true validates :visibility, :inclusion => %w[private public trackable identifiable]