deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reorder and group methods in Notify mailer

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-13 20:55:50 +02:00
parent db469ea3e6
commit 853c69c48a
1 changed files with 75 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
app/mailers/notify.rb
View file

@ -9,11 +9,11 @@ class Notify < ActionMailer::Base
default from: Gitlab.config.email_from default from: Gitlab.config.email_from
def new_user_email(user_id, password)
@user = User.find(user_id)
@password = password #
mail(to: @user.email, subject: subject("Account was created for you")) # Issue
end #
def new_issue_email(issue_id) def new_issue_email(issue_id)
@issue = Issue.find(issue_id) @issue = Issue.find(issue_id)
@ -21,40 +21,26 @@ class Notify < ActionMailer::Base
mail(to: @issue.assignee_email, subject: subject("new issue ##{@issue.id}", @issue.title)) mail(to: @issue.assignee_email, subject: subject("new issue ##{@issue.id}", @issue.title))
end end
def note_wall_email(recipient_id, note_id) def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
@note = Note.find(note_id) @issue = Issue.find(issue_id)
@project = @note.project @previous_assignee ||= User.find(previous_assignee_id)
mail(to: recipient(recipient_id), subject: subject) @project = @issue.project
mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title))
end end
def note_commit_email(recipient_id, note_id) def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@note = Note.find(note_id) @issue = Issue.find issue_id
@commit = @note.noteable @issue_status = status
@commit = CommitDecorator.decorate(@commit) @updated_by = User.find updated_by_user_id
@project = @note.project mail(to: recipient(recipient_id),
mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title)) subject: subject("changed issue ##{@issue.id}", @issue.title))
end end
def note_merge_request_email(recipient_id, note_id)
@note = Note.find(note_id)
@merge_request = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.id}"))
end
def note_issue_email(recipient_id, note_id)
@note = Note.find(note_id)
@issue = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.id}"))
end
def note_wiki_email(recipient_id, note_id) #
@note = Note.find(note_id) # Merge Request
@wiki = @note.noteable #
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for wiki"))
end
def new_merge_request_email(merge_request_id) def new_merge_request_email(merge_request_id)
@merge_request = MergeRequest.find(merge_request_id) @merge_request = MergeRequest.find(merge_request_id)
@ -69,13 +55,53 @@ class Notify < ActionMailer::Base
mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title)) mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title))
end end
def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
@issue = Issue.find(issue_id)
@previous_assignee ||= User.find(previous_assignee_id) #
@project = @issue.project # Note
mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title)) #
def note_commit_email(recipient_id, note_id)
@note = Note.find(note_id)
@commit = @note.noteable
@commit = CommitDecorator.decorate(@commit)
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title))
end end
def note_issue_email(recipient_id, note_id)
@note = Note.find(note_id)
@issue = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.id}"))
end
def note_merge_request_email(recipient_id, note_id)
@note = Note.find(note_id)
@merge_request = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.id}"))
end
def note_wall_email(recipient_id, note_id)
@note = Note.find(note_id)
@project = @note.project
mail(to: recipient(recipient_id), subject: subject)
end
def note_wiki_email(recipient_id, note_id)
@note = Note.find(note_id)
@wiki = @note.noteable
@project = @note.project
mail(to: recipient(recipient_id), subject: subject("note for wiki"))
end
#
# Project
#
def project_access_granted_email(user_project_id) def project_access_granted_email(user_project_id)
@users_project = UsersProject.find user_project_id @users_project = UsersProject.find user_project_id
@project = @users_project.project @project = @users_project.project
@ -83,14 +109,19 @@ class Notify < ActionMailer::Base
subject: subject("access to project was granted")) subject: subject("access to project was granted"))
end end
def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@issue = Issue.find issue_id
@issue_status = status #
@updated_by = User.find updated_by_user_id # User
mail(to: recipient(recipient_id), #
subject: subject("changed issue ##{@issue.id}", @issue.title))
def new_user_email(user_id, password)
@user = User.find(user_id)
@password = password
mail(to: @user.email, subject: subject("Account was created for you"))
end end
private private
# Look up a User by their ID and return their email address # Look up a User by their ID and return their email address