Index: test/unit/mailer_test.rb =================================================================== --- test/unit/mailer_test.rb (リビジョン 22) +++ test/unit/mailer_test.rb (リビジョン 23) @@ -58,9 +58,12 @@ def test_document_added document = Document.find(1) + user = User.find(1) GLoc.valid_languages.each do |lang| Setting.default_language = lang.to_s - assert Mailer.deliver_document_added(document) + result = Mailer.deliver_document_added(document, user) + assert result + assert_match(/#{user.login}/, result.body) end end Index: app/models/mailer.rb =================================================================== --- app/models/mailer.rb (リビジョン 22) +++ app/models/mailer.rb (リビジョン 23) @@ -60,12 +60,13 @@ :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'issues.due_date', :sort_order => 'asc') end - def document_added(document) + def document_added(document, user) redmine_headers 'Project' => document.project.identifier recipients document.project.recipients subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}" body :document => document, - :document_url => url_for(:controller => 'documents', :action => 'show', :id => document) + :document_url => url_for(:controller => 'documents', :action => 'show', :id => document), + :user => user end def attachments_added(attachments) Index: app/controllers/documents_controller.rb =================================================================== --- app/controllers/documents_controller.rb (リビジョン 22) +++ app/controllers/documents_controller.rb (リビジョン 23) @@ -47,7 +47,7 @@ if request.post? and @document.save attach_files(@document, params[:attachments]) flash[:notice] = l(:notice_successful_create) - Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added') + Mailer.deliver_document_added(@document, User.current) if Setting.notified_events.include?('document_added') redirect_to :action => 'index', :project_id => @project end end Index: app/views/mailer/document_added.text.plain.rhtml =================================================================== --- app/views/mailer/document_added.text.plain.rhtml (リビジョン 22) +++ app/views/mailer/document_added.text.plain.rhtml (リビジョン 23) @@ -1,3 +1,5 @@ +(by <%= @user.login %>) + <%= @document.title %> (<%= @document.category.name %>) <%= @document_url %> Index: app/views/mailer/document_added.text.html.rhtml =================================================================== --- app/views/mailer/document_added.text.html.rhtml (リビジョン 22) +++ app/views/mailer/document_added.text.html.rhtml (リビジョン 23) @@ -1,3 +1,5 @@ +

(by <%= @user.login %>)

+ <%= link_to @document.title, @document_url %> (<%= @document.category.name %>)

<%= textilizable(@document, :description, :only_path => false) %>