jro_apps/redmine Commit - r53:418b8d861a6b

mailer bug fix...

Jean-Philippe Lang -

r53:418b8d861a6b

parent child

Context file:

r53:418b8d861a6b

Collapse all files

redmine/app/controllers/issues_controller.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
               before_filter :find_project, :authorize
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               def show
                 @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @journals_count = @issue.journals.count
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "journals.created_on desc")
               end
               def history
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "journals.created_on desc")
                 @journals_count = @journals.length
               end
               def export_pdf
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
               end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
               end
               def add_note
                 unless params[:notes].empty?
                   journal = @issue.init_journal(self.logged_in_user, params[:notes])
                   #@history = @issue.histories.build(params[:history])
                   #@history.author_id = self.logged_in_user.id if self.logged_in_user
                   #@history.status = @issue.status
                   if @issue.save
                     flash[:notice] = l(:notice_successful_update)
                     Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
                 end
                 show
                 render :action => 'show'
               end
               def change_status
                 #@history = @issue.histories.build(params[:history])
                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                 @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
                     #@history.author_id = self.logged_in_user.id if self.logged_in_user
                     #@issue.status = @history.status
                     #@issue.fixed_version_id = (params[:issue][:fixed_version_id])
                     #@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
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
               end
               def destroy
                 @issue.destroy
                 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
               end
               def add_attachment
                 # Save the attachments
                 params[:attachments].each { |a|
                   @attachment = @issue.attachments.build(:file => a, :author => self.logged_in_user) unless a.size == 0
                   @attachment.save
                 } if params[:attachments] and params[:attachments].is_a? Array
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 @issue.attachments.find(params[:attachment_id]).destroy
                 redirect_to :action => 'show', :id => @issue
               end
               # Send the file in stream mode
               def download
                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
                 flash.now[:notice] = l(:notice_file_not_found)
                 render :text => "", :layout => true, :status => 404
               end
             private
               def find_project
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
               end
             end

redmine/app/models/mailer.rb +2 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # 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
+              helper IssuesHelper
               def issue_add(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = $RDM_MAIL_FROM
                 @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
                 @body['issue']  = issue
               end
               def issue_edit(journal)
                 # Sends to all project members
                 issue = journal.journalized
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = $RDM_MAIL_FROM
                 @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
                 @body['issue']  = issue
                 @body['journal']= journal
               end
               def lost_password(token)
                 @recipients     = token.user.mail
                 @from           = $RDM_MAIL_FROM
                 @subject        = l(:mail_subject_lost_password)
                 @body['token']  = token
               end
               def register(token)
                 @recipients     = token.user.mail
                 @from           = $RDM_MAIL_FROM
                 @subject        = l(:mail_subject_register)
                 @body['token']  = token
               end
             end

redmine/app/views/mailer/issue_edit_de.rhtml +1 -1

             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? %>
             ----------------------------------------
             <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

redmine/app/views/mailer/issue_edit_en.rhtml +1 -1

             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? %>
             ----------------------------------------
             <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

redmine/app/views/mailer/issue_edit_es.rhtml +1 -1

             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? %>
             ----------------------------------------
             <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

redmine/app/views/mailer/issue_edit_fr.rhtml +1 -1

             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? %>
             ----------------------------------------
             <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages