Changed User model to not allow nil display_name (w/ tests)

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 5096a81aafcb7e69e9b77d8d90b3fd9f933ec545..0e81805509aea9ad62a3abe88de54f557bdb0f47 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -2,17 +2,18 @@
 #
 # Table name: gpx_files
 #
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
+#  id          :bigint(8)        not null, primary key
+#  user_id     :bigint(8)        not null
 #  visible     :boolean          default(TRUE), not null
 #  name        :string           default(""), not null
-#  size        :integer
+#  size        :bigint(8)
 #  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,6 +40,7 @@ class Trace < ActiveRecord::Base
 
   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 :timestamp, :presence => true
   validates :visibility, :inclusion => %w[private public trackable identifiable]