redmine_plugins/redmine_custom_workflows
1
0
Fork 0
mirror of https://github.com/anteo/redmine_custom_workflows.git synced 2026-01-26 00:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anton Argirov 2015-12-12 20:31:20 +06:00
commit 79c404afa0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/custom_workflow.rb
View File

@ -155,7 +155,7 @@ class CustomWorkflow < ActiveRecord::Base
object.send :instance_variable_set, :@attachment, Attachment.new object.send :instance_variable_set, :@attachment, Attachment.new
object.send :instance_variable_set, :@page, object object.send :instance_variable_set, :@page, object
end end
CustomWorkflow.run_shared_code self CustomWorkflow.run_shared_code object
[:before_add, :after_add, :before_remove, :after_remove].each {|field| validate_syntax_for object, field} [:before_add, :after_add, :before_remove, :after_remove].each {|field| validate_syntax_for object, field}
end end
end end

2
app/views/custom_workflows/_form.html.erb
View File

@ -92,7 +92,7 @@
<% end %> <% end %>
<%= render :layout => 'layouts/collapsible', <%= render :layout => 'layouts/collapsible',
:locals => { :locals => {
:collapsed => (not (@workflow.before_destroy.present? or @workflow.before_destroy.present?)), :collapsed => (not (@workflow.before_destroy.present? or @workflow.after_destroy.present?)),
:label => l(:label_destroy_workflows)} do %> :label => l(:label_destroy_workflows)} do %>
<div class="splitcontent"> <div class="splitcontent">
<div class="splitcontentleft"> <div class="splitcontentleft">