Error texts

keith · Apr 18, 2014 · a753721 · a753721
1 parent 73aa719
commit a753721
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/applicants_controller.rb b/app/controllers/applicants_controller.rb
@@ -46,7 +46,7 @@ def create
     positions.each do |arr|
       professor = arr.last[:professor_attributes]
       existing = Professor.find_by_email(professor[:email])
-      Professor.create!(professor) unless existing
+      Professor.create(professor) unless existing
     end
 
     @applicant = Applicant.new(applicant_params)

diff --git a/app/models/applicant.rb b/app/models/applicant.rb
@@ -14,7 +14,7 @@ class Applicant < ActiveRecord::Base
   validate :static_identifier, on: :update
   validates :phone_number, length: { minimum: 10 }
   validates :email, presence: true, uniqueness: { case_sensitive: false },
-    format: { with: EMAIL_REGEX }
+    format: { with: EMAIL_REGEX, message: 'is invalid (only enter before the @ symbol)' }
   validates :class_standing, on: :update, inclusion: { in: 0...Standing.names.count }
   validates_presence_of :name
   validates_presence_of :wuid

diff --git a/app/models/professor.rb b/app/models/professor.rb
@@ -9,7 +9,7 @@ class Professor < ActiveRecord::Base
   validate :static_identifier, on: :update
   validates_presence_of :name
   validates :email, presence: true, uniqueness: { case_sensitive: false },
-    format: { with: EMAIL_REGEX }
+    format: { with: EMAIL_REGEX, message: 'is invalid (only enter before the @ symbol)' }
 
   def to_param
     identifier

diff --git a/app/views/applicants/new.html.erb b/app/views/applicants/new.html.erb
@@ -21,7 +21,7 @@
   <div class="field">
     <%# TODO: The email suffix get's put on a newline when there are errors %>
     <%= f.label :email, class: 'sr-only' %><br>
-    <%= f.text_field :email , class: 'form-control', placeholder: 'Winthrop Username' %>
+    <%= f.text_field :email , class: 'form-control', placeholder: 'Winthrop Email' %><%= EMAIL_SUFFIX %>
   </div>
   <div class="field">
     <%= f.label :wuid, class: 'sr-only' %><br>