Fixed new mr/issue emails

master
Dmitriy Zaporozhets 2013-03-28 12:52:44 +02:00
parent ecf3b2e471
commit 2f585840db
4 changed files with 12 additions and 7 deletions

View File

@ -1,9 +1,9 @@
module Emails
module Issues
def new_issue_email(issue_id)
def new_issue_email(recipient_id, issue_id)
@issue = Issue.find(issue_id)
@project = @issue.project
mail(to: @issue.assignee_email, subject: subject("new issue ##{@issue.id}", @issue.title))
mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title))
end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)

View File

@ -1,9 +1,9 @@
module Emails
module MergeRequests
def new_merge_request_email(merge_request_id)
def new_merge_request_email(recipient_id, merge_request_id)
@merge_request = MergeRequest.find(merge_request_id)
@project = @merge_request.project
mail(to: @merge_request.assignee_email, subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title))
end
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)

View File

@ -1,5 +1,9 @@
%p
New Issue was created and assigned to you.
New Issue was created.
%p
= "Issue ##{@issue.id}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
%p
Author: #{@issue.author_name}
%p
Assignee: #{@issue.assignee_name}

View File

@ -1,4 +1,5 @@
New Issue was created and assigned to you.
New Issue was created.
Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
Author: <%= @issue.author_name %>
Asignee: <%= @issue.assignee_name %>