Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-06 21:35:46 +01:00
Code Issues Packages Projects Releases Activity

Show open/closed badge in email notifications (#33834).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19982 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-08-21 08:32:15 +00:00
parent ab0dd3a52a
commit 4edba4fa9d
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/layouts/mailer.html.erb
View File

@@ -47,6 +47,26 @@ table, td, th {
border: 1px solid #bbb; border: 1px solid #bbb;
padding: 4px; padding: 4px;
} }
.badge {
position:relative;
font-weight:bold;
font-size: 10px;
bottom: 2px;
padding: 1px 3px;
margin-right: 2px;
margin-left: 2px;
border-radius: 2px;
text-transform: uppercase;
text-decoration: none;
}
.badge-status-open {
color: #205D86;
border: 1px solid #205D86;
}
.badge-status-closed {
color: #1D781D;
border: 1px solid #1D781D;
}
</style> </style>
</head> </head>
<body> <body>

5
app/views/mailer/_issue.html.erb
View File

@@ -1,4 +1,7 @@
<h1><%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %></h1> <h1>
<%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %>
<%= issue_status_type_badge(issue.status) %>
</h1>
<%= render_email_issue_attributes(issue, user, true) %> <%= render_email_issue_attributes(issue, user, true) %>

10
test/unit/mailer_test.rb
View File

@@ -480,6 +480,16 @@ class MailerTest < ActiveSupport::TestCase
end end
end end
def test_issue_add_should_include_issue_status_type_badge
issue = Issue.find(1)
Mailer.deliver_issue_add(issue)
mail = last_email
assert_select_email do
assert_select 'span.badge.badge-status-open', text: 'open'
end
end
def test_issue_edit_subject_should_include_status_changes_if_setting_is_enabled def test_issue_edit_subject_should_include_status_changes_if_setting_is_enabled
with_settings :show_status_changes_in_mail_subject => 1 do with_settings :show_status_changes_in_mail_subject => 1 do
issue = Issue.find(2) issue = Issue.find(2)