From: Toshi MARUYAMA Date: Mon, 3 Oct 2011 15:17:07 +0000 (+0000) Subject: Rails3: mail: rename app/views/mailer/_issue_text_plain.rhtml to app/views/mailer... X-Git-Tag: 1.3.0~413 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee5f712e8990e1bd5a19d74994b3c632377822c7;p=redmine.git Rails3: mail: rename app/views/mailer/_issue_text_plain.rhtml to app/views/mailer/_issue.text.erb (#6317) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7566 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb new file mode 100644 index 000000000..bea2a5813 --- /dev/null +++ b/app/views/mailer/_issue.text.erb @@ -0,0 +1,13 @@ +<%= "#{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.custom_field_values.each do |c| %><%= c.custom_field.name %>: <%= show_value(c) %> +<% end %> + +<%= issue.description %> diff --git a/app/views/mailer/_issue_text_plain.rhtml b/app/views/mailer/_issue_text_plain.rhtml deleted file mode 100644 index bea2a5813..000000000 --- a/app/views/mailer/_issue_text_plain.rhtml +++ /dev/null @@ -1,13 +0,0 @@ -<%= "#{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.custom_field_values.each do |c| %><%= c.custom_field.name %>: <%= show_value(c) %> -<% end %> - -<%= issue.description %> diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb index 19c1dcf5b..761cd7924 100644 --- a/app/views/mailer/issue_add.text.erb +++ b/app/views/mailer/issue_add.text.erb @@ -1,4 +1,4 @@ <%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %> ---------------------------------------- -<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue.text.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %> diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb index 870f8fa3a..1ea2a64e5 100644 --- a/app/views/mailer/issue_edit.text.erb +++ b/app/views/mailer/issue_edit.text.erb @@ -6,4 +6,4 @@ <%= @journal.notes if @journal.notes? %> ---------------------------------------- -<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %> +<%= render :partial => "issue.text.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>