up

qingping · Sep 5, 2010 · 343275f · 343275f
1 parent cee0529
commit 343275f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/models/form.rb b/app/models/form.rb
@@ -75,7 +75,7 @@ def name
     self.fields.each do |field|
       klass.key "f#{field.id}", String
       klass.validates_presence_of "f#{field.id}".to_sym, :message => I18n.t('activemodel.errors.messages.blank') if field.required
-      klass.validates_format_of "f#{field.id}".to_sym, :with => Authentication.email_regex if field.intern == 'email'
+      klass.validates_uniqueness_of "f#{field.id}", :message => I18n.t('activemodel.errors.messages.taken') if field.unique
 
       if field.input == 'check' || field.input == 'radio'
         klass.class_eval <<-METHOD

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -6,6 +6,7 @@ en:
     errors:
       messages:
         blank: "can't be blank"
+        taken: "already been taken"
 
   logo: 'en-logo.png'
   create_survey: "Create Survey"