From 366eba58049b36b00df38d64396278095d35066f Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 10 Nov 2014 09:42:27 -0300
Subject: [PATCH] Fix mail sending at send_notification method

---
 app/controllers/public/account_controller.rb   |  2 +-
 app/models/task.rb                             |  5 +++--
 app/views/task_mailer/generic_message.text.erb |  9 +++++++++
 app/views/task_mailer/task_activated.text.erb  |  1 -
 app/views/task_mailer/task_cancelled.text.erb  |  9 ---------
 app/views/task_mailer/task_created.text.erb    |  1 -
 app/views/task_mailer/task_finished.text.erb   |  1 -
 7 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 app/views/task_mailer/generic_message.text.erb
 delete mode 120000 app/views/task_mailer/task_activated.text.erb
 delete mode 100644 app/views/task_mailer/task_cancelled.text.erb
 delete mode 120000 app/views/task_mailer/task_created.text.erb
 delete mode 120000 app/views/task_mailer/task_finished.text.erb

diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 1e5c2b4..a7cf41d 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -193,7 +193,7 @@ class AccountController < ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
diff --git a/app/models/task.rb b/app/models/task.rb
index f74bc73..0620e84 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -285,8 +285,9 @@ class Task < ActiveRecord::Base
   # If
   def send_notification(action)
     if sends_email?
-      if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+      if self.requestor && !self.requestor.notification_emails.empty?
+        message = TaskMailer.generic_message("task_#{action}", self)
+        message.deliver if message
       end
     end
   end
diff --git a/app/views/task_mailer/generic_message.text.erb b/app/views/task_mailer/generic_message.text.erb
new file mode 100644
index 0000000..9f74c43
--- /dev/null
+++ b/app/views/task_mailer/generic_message.text.erb
@@ -0,0 +1,9 @@
+<%= _('Dear %s,') % @requestor %>
+
+<%= word_wrap(@message) %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
diff --git a/app/views/task_mailer/task_activated.text.erb b/app/views/task_mailer/task_activated.text.erb
deleted file mode 120000
index 868d0e6..0000000
--- a/app/views/task_mailer/task_activated.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_cancelled.text.erb b/app/views/task_mailer/task_cancelled.text.erb
deleted file mode 100644
index 9f74c43..0000000
--- a/app/views/task_mailer/task_cancelled.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= _('Dear %s,') % @requestor %>
-
-<%= word_wrap(@message) %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
diff --git a/app/views/task_mailer/task_created.text.erb b/app/views/task_mailer/task_created.text.erb
deleted file mode 120000
index 868d0e6..0000000
--- a/app/views/task_mailer/task_created.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.erb
\ No newline at end of file
diff --git a/app/views/task_mailer/task_finished.text.erb b/app/views/task_mailer/task_finished.text.erb
deleted file mode 120000
index 868d0e6..0000000
--- a/app/views/task_mailer/task_finished.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-task_cancelled.text.erb
\ No newline at end of file
--
libgit2 0.21.2