Merge pull request #157 from azul/bugfix/5664-stop-email-autofill

Bugfix/5664 stop email autofill

4 files changed, 21 insertions, 16 deletions

diff --git a/engines/support/app/controllers/tickets_controller.rb b/engines/support/app/controllers/tickets_controller.rb
index d552209..99357ab 100644
--- a/engines/support/app/controllers/tickets_controller.rb
+++ b/engines/support/app/controllers/tickets_controller.rb
@@ -12,6 +12,7 @@ class TicketsController < ApplicationController
 
   def new
     @ticket = Ticket.new
+    @ticket.created_by = current_user.id
     @ticket.comments.build
   end
 
@@ -22,12 +23,9 @@ class TicketsController < ApplicationController
     @ticket.comments.last.posted_by = current_user.id
     @ticket.comments.last.private = false unless admin?
     @ticket.created_by = current_user.id
-    @ticket.email = current_user.email_address if current_user.email_address
     if @ticket.save
       flash[:notice] = t(:thing_was_successfully_created, :thing => t(:ticket))
-
-      # cannot set this until ticket has been saved, as @ticket.id will not be set
-      if !logged_in? and flash[:notice]
+      if !logged_in?
         flash[:notice] += " " + t(:access_ticket_text, :full_url => ticket_url(@ticket.id))
       end
     end
diff --git a/engines/support/app/models/ticket.rb b/engines/support/app/models/ticket.rb
index cd22758..bf5df53 100644
--- a/engines/support/app/models/ticket.rb
+++ b/engines/support/app/models/ticket.rb
@@ -19,8 +19,6 @@ class Ticket < CouchRest::Model::Base
 
   timestamps!
 
-  before_validation :set_email, :set_regarding_user, :on => :create
-
   design do
     view :by_updated_at
     view :by_created_at
@@ -34,7 +32,12 @@ class Ticket < CouchRest::Model::Base
   end
 
   validates :subject, :presence => true
-  validates :email, :allow_blank => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/
+
+  # email can have three states:
+  # * nil - prefilled with created_by's email
+  # * "" - cleared
+  # * valid email address
+  validates :email, :allow_blank => true, :format => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/
 
   def self.search(options = {})
     @selection = TicketSelection.new(options)
@@ -48,15 +51,15 @@ class Ticket < CouchRest::Model::Base
   end
 
   def is_creator_validated?
-    !!created_by
+    created_by_user.is_a? User
   end
 
-  def set_email
-    self.email = nil if self.email == ""
+  def email
+    read_attribute(:email) || created_by_user.email
   end
 
-  def set_regarding_user
-    self.regarding_user = nil if self.regarding_user == ""
+  def regarding_user
+    read_attribute(:regarding_user) || created_by_user.login
   end
 
   def close
@@ -95,7 +98,11 @@ class Ticket < CouchRest::Model::Base
   end
 
   def created_by_user
-    User.find(self.created_by)
+    if self.created_by
+      User.find(self.created_by) || AnonymousUser.new
+    else
+      AnonymousUser.new
+    end
   end
 
   def regarding_user_actual_user
diff --git a/engines/support/app/views/tickets/_edit_form.html.haml b/engines/support/app/views/tickets/_edit_form.html.haml
index bf175fe..fb279fb 100644
--- a/engines/support/app/views/tickets/_edit_form.html.haml
+++ b/engines/support/app/views/tickets/_edit_form.html.haml
@@ -1,6 +1,6 @@
 :ruby
   # created by user link
-  if @ticket.created_by_user
+  if @ticket.is_creator_validated?
     created_by = link_to @ticket.created_by_user.login, @ticket.created_by_user
   else
     created_by = t(:anonymous)
diff --git a/engines/support/app/views/tickets/new.html.haml b/engines/support/app/views/tickets/new.html.haml
index ab008d2..3de5fe9 100644
--- a/engines/support/app/views/tickets/new.html.haml
+++ b/engines/support/app/views/tickets/new.html.haml
@@ -8,8 +8,8 @@
 = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
   = hidden_ticket_fields
   = f.input :subject
-  = f.input :email, input_html: {value: user.email_address}
-  = f.input :regarding_user, input_html: {value: user.login}
+  = f.input :email
+  = f.input :regarding_user
   = f.simple_fields_for :comments, @comment do |c|
     = c.input :body, :label => t(:description), :as => :text, :input_html => {:class => "full-width", :rows=> 5}
     - if admin?