mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Make the email notifications for adding/updating issues more readable/clear (#23978).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16087 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
831a2d58ab
commit
e8e92ca054
@ -295,23 +295,31 @@ module IssuesHelper
|
||||
users
|
||||
end
|
||||
|
||||
def email_issue_attributes(issue, user)
|
||||
def email_issue_attributes(issue, user, html)
|
||||
items = []
|
||||
%w(author status priority assigned_to category fixed_version).each do |attribute|
|
||||
unless issue.disabled_core_fields.include?(attribute+"_id")
|
||||
items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
|
||||
if html
|
||||
items << content_tag('strong', "#{l("field_#{attribute}")}: ") + (issue.send attribute)
|
||||
else
|
||||
items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
|
||||
end
|
||||
end
|
||||
end
|
||||
issue.visible_custom_field_values(user).each do |value|
|
||||
items << "#{value.custom_field.name}: #{show_value(value, false)}"
|
||||
if html
|
||||
items << content_tag('strong', "#{value.custom_field.name}: ") + show_value(value, false)
|
||||
else
|
||||
items << "#{value.custom_field.name}: #{show_value(value, false)}"
|
||||
end
|
||||
end
|
||||
items
|
||||
end
|
||||
|
||||
def render_email_issue_attributes(issue, user, html=false)
|
||||
items = email_issue_attributes(issue, user)
|
||||
items = email_issue_attributes(issue, user, html)
|
||||
if html
|
||||
content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
|
||||
content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe, :class => "details")
|
||||
else
|
||||
items.map{|s| "* #{s}"}.join("\n")
|
||||
end
|
||||
|
||||
@ -38,6 +38,7 @@ pre {
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
}
|
||||
ul.details {color:#959595; margin-bottom: 1.5em;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -2,8 +2,9 @@
|
||||
(<%= l(:field_private_notes) %>)
|
||||
<% end %>
|
||||
<%= l(:text_issue_updated, :id => link_to("##{@issue.id}", @issue_url), :author => h(@journal.user)).html_safe %>
|
||||
<hr />
|
||||
|
||||
<ul>
|
||||
<ul class="details">
|
||||
<% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
|
||||
<li><%= string %></li>
|
||||
<% end %>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user