Diff
Modified: trunk/app/helpers/workflows_helper.rb (3092 => 3093)
--- trunk/app/helpers/workflows_helper.rb 2012-08-21 10:19:02 UTC (rev 3092)
+++ trunk/app/helpers/workflows_helper.rb 2012-08-21 10:19:39 UTC (rev 3093)
@@ -13,8 +13,8 @@
types << "Other"
end
- def get_type_dir(workflow)
- klass = workflow.processor_class
+ def get_type_dir(workflow_version)
+ klass = workflow_version.processor_class
return (klass.nil? ? "other" : h(klass.to_s.demodulize.underscore))
end
Modified: trunk/app/models/workflow.rb (3092 => 3093)
--- trunk/app/models/workflow.rb 2012-08-21 10:19:02 UTC (rev 3092)
+++ trunk/app/models/workflow.rb 2012-08-21 10:19:39 UTC (rev 3093)
@@ -150,7 +150,7 @@
def processor_class
if self.content_type
- @processor_class ||= WorkflowTypesHandler.processor_class_for_type_display_name(self.content_type.title)
+ @processor_class ||= WorkflowTypesHandler.processor_class_for_type_display_name(self.content_type.title)
end
end
@@ -170,25 +170,34 @@
end
def get_workflow_processor(version = current_version)
- return nil unless (workflow_version = self.find_version(version))
- return (self.processor_class.nil? ? nil : self.processor_class.new(workflow_version.content_blob.data))
+
+ return nil unless workflow_version = self.find_version(version)
+ return nil unless version_processor = workflow_version.processor_class
+
+ version_processor.new(workflow_version.content_blob.data)
end
def get_workflow_model_object(version)
- return nil unless (workflow_version = self.find_version(version))
- return (self.processor_class.nil? ? nil : self.processor_class.new(workflow_version.content_blob.data).get_workflow_model_object)
+
+ return nil unless version_processor = get_workflow_processor(version)
+
+ version_processor.get_workflow_model_object
end
-
+
def get_search_terms(version)
- return nil unless (workflow_version = self.find_version(version))
- return (self.processor_class.nil? ? nil : self.processor_class.new(workflow_version.content_blob.data).get_search_terms)
+
+ return nil unless version_processor = get_workflow_processor(version)
+
+ version_processor.get_search_terms
end
# Begin acts_as_runnable overridden methods
def get_input_ports(version)
- return nil unless (workflow_version = self.find_version(version))
- return (self.processor_class.nil? ? nil : self.processor_class.new(workflow_version.content_blob.data).get_workflow_model_input_ports)
+
+ return nil unless version_processor = get_workflow_processor(version)
+
+ return version_processor.get_workflow_model_input_ports
end
# End acts_as_runnable overridden methods
Modified: trunk/app/views/workflows/show.rhtml (3092 => 3093)
--- trunk/app/views/workflows/show.rhtml 2012-08-21 10:19:02 UTC (rev 3092)
+++ trunk/app/views/workflows/show.rhtml 2012-08-21 10:19:39 UTC (rev 3093)
@@ -213,7 +213,7 @@
<% if @authorised_to_download %>
<% begin %>
- <%= render :partial => "workflows/#{get_type_dir(@workflow)}/internals", :locals => { :workflow => @workflow, :version => @viewing_version_number } -%>
+ <%= render :partial => "workflows/#{get_type_dir(@viewing_version)}/internals", :locals => { :workflow => @workflow, :version => @viewing_version_number } -%>
<% rescue %>
<p class="none_text">
There was a problem in extracting the internals of this workflow.