diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2006-11-27 22:45:10 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2006-11-27 22:45:10 +0000 |
| commit | 418b8d861a6b7addb6bfe302d76b8a1dcdf9bea8 (patch) | |
| tree | 0721255c26e943a45851f96f335d4a49bc06fa2d /redmine/app | |
| parent | 42181112ff73822afe5c0f96e065ae372f392e47 (diff) | |
| download | redmine-418b8d861a6b7addb6bfe302d76b8a1dcdf9bea8.tar.gz redmine-418b8d861a6b7addb6bfe302d76b8a1dcdf9bea8.zip | |
mailer bug fix
git-svn-id: http://redmine.rubyforge.org/svn/trunk@55 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'redmine/app')
| -rw-r--r-- | redmine/app/controllers/issues_controller.rb | 4 | ||||
| -rw-r--r-- | redmine/app/models/mailer.rb | 4 | ||||
| -rw-r--r-- | redmine/app/views/mailer/issue_edit_de.rhtml | 2 | ||||
| -rw-r--r-- | redmine/app/views/mailer/issue_edit_en.rhtml | 2 | ||||
| -rw-r--r-- | redmine/app/views/mailer/issue_edit_es.rhtml | 2 | ||||
| -rw-r--r-- | redmine/app/views/mailer/issue_edit_fr.rhtml | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/redmine/app/controllers/issues_controller.rb b/redmine/app/controllers/issues_controller.rb index e196e8226..94e036ab3 100644 --- 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])
#@issue.done_ratio = (params[:issue][:done_ratio])
#@issue.lock_version = (params[:issue][:lock_version])
- @issue.init_journal(self.logged_in_user, params[:notes])
+ journal = @issue.init_journal(self.logged_in_user, params[:notes])
@issue.status = @new_status
if @issue.update_attributes(params[:issue])
flash[:notice] = l(:notice_successful_update)
- Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
+ Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
redirect_to :action => 'show', :id => @issue
end
rescue ActiveRecord::StaleObjectError
diff --git a/redmine/app/models/mailer.rb b/redmine/app/models/mailer.rb index bbe782526..07047c594 100644 --- 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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class Mailer < ActionMailer::Base +class Mailer < ActionMailer::Base
+
+ 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 1b97a571b..d22d6c534 100644 --- 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.
<%= @journal.user.name %>
<% for detail in @journal.details %>
-<%= show_detail(detail) %>
+<%= show_detail(detail, true) %>
<% end %>
<%= @journal.notes if @journal.notes? %>
----------------------------------------
diff --git a/redmine/app/views/mailer/issue_edit_en.rhtml b/redmine/app/views/mailer/issue_edit_en.rhtml index 1b97a571b..d22d6c534 100644 --- 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.
<%= @journal.user.name %>
<% for detail in @journal.details %>
-<%= show_detail(detail) %>
+<%= show_detail(detail, true) %>
<% end %>
<%= @journal.notes if @journal.notes? %>
----------------------------------------
diff --git a/redmine/app/views/mailer/issue_edit_es.rhtml b/redmine/app/views/mailer/issue_edit_es.rhtml index 1b97a571b..d22d6c534 100644 --- 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.
<%= @journal.user.name %>
<% for detail in @journal.details %>
-<%= show_detail(detail) %>
+<%= show_detail(detail, true) %>
<% end %>
<%= @journal.notes if @journal.notes? %>
----------------------------------------
diff --git a/redmine/app/views/mailer/issue_edit_fr.rhtml b/redmine/app/views/mailer/issue_edit_fr.rhtml index b7c3a50a3..9edacb703 100644 --- 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.
<%= @journal.user.name %> - <%= format_date(@journal.created_on) %>
<% for detail in @journal.details %>
-<%= show_detail(detail) %>
+<%= show_detail(detail, true) %>
<% end %>
<%= journal.notes if journal.notes? %>
----------------------------------------
|