diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-08-05 17:08:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-08-05 17:08:26 +0000 |
| commit | fd1b0607055909142e75f437a326273c3bd370e5 (patch) | |
| tree | 60d53cd94e140f08072ba2c09ffe9dbd4e9e858e /app/views/mailer | |
| parent | b19b90234529206205abfa21c4a92ba7cebb7d98 (diff) | |
| download | redmine-fd1b0607055909142e75f437a326273c3bd370e5.tar.gz redmine-fd1b0607055909142e75f437a326273c3bd370e5.zip | |
Fixed that standard fields disabled still appear in email notifications (#14584).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12079 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/mailer')
| -rw-r--r-- | app/views/mailer/_issue.html.erb | 12 | ||||
| -rw-r--r-- | app/views/mailer/_issue.text.erb | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb index aee365e56..6b84a5be1 100644 --- a/app/views/mailer/_issue.html.erb +++ b/app/views/mailer/_issue.html.erb @@ -1,16 +1,6 @@ <h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1> -<ul> -<li><%=l(:field_author)%>: <%=h issue.author %></li> -<li><%=l(:field_status)%>: <%=h issue.status %></li> -<li><%=l(:field_priority)%>: <%=h issue.priority %></li> -<li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li> -<li><%=l(:field_category)%>: <%=h issue.category %></li> -<li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li> -<% issue.visible_custom_field_values(users.first).each do |c| %> - <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li> -<% end %> -</ul> +<%= render_email_issue_attributes(issue, users.first, true) %> <%= textilizable(issue, :description, :only_path => false) %> diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb index a2d5a41b2..0034c441f 100644 --- a/app/views/mailer/_issue.text.erb +++ b/app/views/mailer/_issue.text.erb @@ -1,14 +1,7 @@ <%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %> <%= issue_url %> -* <%=l(:field_author)%>: <%= issue.author %> -* <%=l(:field_status)%>: <%= issue.status %> -* <%=l(:field_priority)%>: <%= issue.priority %> -* <%=l(:field_assigned_to)%>: <%= issue.assigned_to %> -* <%=l(:field_category)%>: <%= issue.category %> -* <%=l(:field_fixed_version)%>: <%= issue.fixed_version %> -<% issue.visible_custom_field_values(users.first).each do |c| %>* <%= c.custom_field.name %>: <%= show_value(c) %> -<% end -%> +<%= render_email_issue_attributes(issue, users.first) %> ---------------------------------------- <%= issue.description %> |