mailer bug fix

git-svn-id: http://redmine.rubyforge.org/svn/trunk@55 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/redmine/app/controllers/issues_controller.rb b/redmine/app/controllers/issues_controller.rb
index e196e82..94e036a 100644 (file)
--- a/redmine/app/controllers/issues_controller.rb
+++ b/redmine/app/controllers/issues_controller.rb
@@ -93,11 +93,11 @@ class IssuesController < ApplicationController
         #@issue.assigned_to_id = (params[:issue][:assigned_to_id])\r
         #@issue.done_ratio = (params[:issue][:done_ratio])\r
         #@issue.lock_version = (params[:issue][:lock_version])\r
-        @issue.init_journal(self.logged_in_user, params[:notes])\r
+        journal = @issue.init_journal(self.logged_in_user, params[:notes])\r
         @issue.status = @new_status\r
         if @issue.update_attributes(params[:issue])\r
           flash[:notice] = l(:notice_successful_update)\r
-          Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?\r
+          Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?\r
           redirect_to :action => 'show', :id => @issue\r
         end\r
       rescue ActiveRecord::StaleObjectError\r

diff --git a/redmine/app/models/mailer.rb b/redmine/app/models/mailer.rb
index bbe7825..07047c5 100644 (file)
--- a/redmine/app/models/mailer.rb
+++ b/redmine/app/models/mailer.rb
@@ -15,7 +15,9 @@
 # along with this program; if not, write to the Free Software\r
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\r
 \r
-class Mailer < ActionMailer::Base
+class Mailer < ActionMailer::Base\r
+\r
+  helper IssuesHelper
 
   def issue_add(issue)
     # Sends to all project members

diff --git a/redmine/app/views/mailer/issue_edit_de.rhtml b/redmine/app/views/mailer/issue_edit_de.rhtml
index 1b97a57..d22d6c5 100644 (file)
--- a/redmine/app/views/mailer/issue_edit_de.rhtml
+++ b/redmine/app/views/mailer/issue_edit_de.rhtml
@@ -1,7 +1,7 @@
 Issue #<%= @issue.id %> has been updated.\r
 <%= @journal.user.name %>\r
 <% for detail in @journal.details %>\r
-<%= show_detail(detail) %>\r
+<%= show_detail(detail, true) %>\r
 <% end %>\r
 <%= @journal.notes if @journal.notes? %>\r
 ----------------------------------------\r

diff --git a/redmine/app/views/mailer/issue_edit_en.rhtml b/redmine/app/views/mailer/issue_edit_en.rhtml
index 1b97a57..d22d6c5 100644 (file)
--- a/redmine/app/views/mailer/issue_edit_en.rhtml
+++ b/redmine/app/views/mailer/issue_edit_en.rhtml
@@ -1,7 +1,7 @@
 Issue #<%= @issue.id %> has been updated.\r
 <%= @journal.user.name %>\r
 <% for detail in @journal.details %>\r
-<%= show_detail(detail) %>\r
+<%= show_detail(detail, true) %>\r
 <% end %>\r
 <%= @journal.notes if @journal.notes? %>\r
 ----------------------------------------\r

diff --git a/redmine/app/views/mailer/issue_edit_es.rhtml b/redmine/app/views/mailer/issue_edit_es.rhtml
index 1b97a57..d22d6c5 100644 (file)
--- a/redmine/app/views/mailer/issue_edit_es.rhtml
+++ b/redmine/app/views/mailer/issue_edit_es.rhtml
@@ -1,7 +1,7 @@
 Issue #<%= @issue.id %> has been updated.\r
 <%= @journal.user.name %>\r
 <% for detail in @journal.details %>\r
-<%= show_detail(detail) %>\r
+<%= show_detail(detail, true) %>\r
 <% end %>\r
 <%= @journal.notes if @journal.notes? %>\r
 ----------------------------------------\r

diff --git a/redmine/app/views/mailer/issue_edit_fr.rhtml b/redmine/app/views/mailer/issue_edit_fr.rhtml
index b7c3a50..9edacb7 100644 (file)
--- a/redmine/app/views/mailer/issue_edit_fr.rhtml
+++ b/redmine/app/views/mailer/issue_edit_fr.rhtml
@@ -1,7 +1,7 @@
 La demande #<%= @issue.id %> a été mise à jour.\r
 <%= @journal.user.name %> - <%= format_date(@journal.created_on) %>\r
 <% for detail in @journal.details %>\r
-<%= show_detail(detail) %>\r
+<%= show_detail(detail, true) %>\r
 <% end %>\r
 <%= journal.notes if journal.notes? %>\r
 ----------------------------------------\r