Merge remote-tracking branch 'origin/master'

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

View File

@ -155,7 +155,7 @@ class CustomWorkflow < ActiveRecord::Base
object.send :instance_variable_set, :@attachment, Attachment.new
object.send :instance_variable_set, :@page, object
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}
end
end

View File

@ -92,7 +92,7 @@
<% end %>
<%= render :layout => 'layouts/collapsible',
: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 %>
<div class="splitcontent">
<div class="splitcontentleft">