Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from abf/rosa-build:91-remove-greeting-from-issue_assign_notification 

[refs #91]: remove greeting from issue_assign_notification
This commit is contained in:
warpc 2013-04-10 14:01:20 +04:00
parent 0035d54fe2 0ef0e55e58
commit 016cac8be6
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_mailer.rb
View File

@ -42,7 +42,7 @@ class UserMailer < ActionMailer::Base
end end
def issue_assign_notification(issue, user) def issue_assign_notification(issue, user)
@user, @issue = user, issue @issue = issue
mail( mail(
:to => email_with_name(user, user.email), :to => email_with_name(user, user.email),
:subject => subject_for_issue(@issue) :subject => subject_for_issue(@issue)

6
app/views/user_mailer/issue_assign_notification.en.haml
View File

@ -1,7 +1,3 @@
%p== Hello, #{@user.user_appeal}.
%p You have been assigned to issue #{ link_to @issue.title, project_issue_url(@issue.project, @issue) } %p You have been assigned to issue #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }
= render 'footer'
= render 'footer'

6
app/views/user_mailer/issue_assign_notification.ru.haml
View File

@ -1,7 +1,3 @@
%p== Здравствуйте, #{@user.user_appeal}.
%p Вам была назначена задача #{ link_to @issue.title, project_issue_url(@issue.project, @issue) } %p Вам была назначена задача #{ link_to @issue.title, project_issue_url(@issue.project, @issue) }
= render 'footer'
= render 'footer'

4
spec/mailers/user_mailer_spec.rb
View File

@ -64,10 +64,6 @@ describe UserMailer do
@email.from.should == [APP_CONFIG['do-not-reply-email']] @email.from.should == [APP_CONFIG['do-not-reply-email']]
end end
it 'should assign user name' do
@email.body.encoded.should match(@user.name)
end
it 'should assign issue title' do it 'should assign issue title' do
@email.body.encoded.should match(@issue.title) @email.body.encoded.should match(@issue.title)
end end