mirror of
https://github.com/anteo/redmine_custom_workflows.git
synced 2026-01-26 00:04:20 +00:00
Merge pull request #106 from germanolucas/master
Update mailer_patch.rb
This commit is contained in:
commit
9ab09c2777
2
init.rb
2
init.rb
@ -11,7 +11,7 @@ Redmine::Plugin.register :redmine_custom_workflows do
|
|||||||
|
|
||||||
menu :admin_menu, :custom_workflows, {:controller => 'custom_workflows', :action => 'index'},
|
menu :admin_menu, :custom_workflows, {:controller => 'custom_workflows', :action => 'index'},
|
||||||
:if => Proc.new { User.current.admin? }, :caption => :label_custom_workflow_plural,
|
:if => Proc.new { User.current.admin? }, :caption => :label_custom_workflow_plural,
|
||||||
:html => {:class => 'icon icon-workflows'}
|
:html => {:class => 'icon icon-workflows'}
|
||||||
|
|
||||||
permission :manage_project_workflow, {}, :require => :member
|
permission :manage_project_workflow, {}, :require => :member
|
||||||
end
|
end
|
||||||
|
|||||||
@ -18,7 +18,7 @@ module RedmineCustomWorkflows
|
|||||||
if text_body || html_body
|
if text_body || html_body
|
||||||
mail headers do |format|
|
mail headers do |format|
|
||||||
format.text { render :text => text_body } if text_body
|
format.text { render :text => text_body } if text_body
|
||||||
format.html { render :html => html_body } if html_body
|
format.html { render :text => html_body } if html_body
|
||||||
end
|
end
|
||||||
elsif template_name
|
elsif template_name
|
||||||
template_params.each { |k,v| instance_variable_set("@#{k}", v) }
|
template_params.each { |k,v| instance_variable_set("@#{k}", v) }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user