Modified: branches/packs/app/controllers/packs_controller.rb (3636 => 3637)
--- branches/packs/app/controllers/packs_controller.rb 2013-08-28 11:14:00 UTC (rev 3636)
+++ branches/packs/app/controllers/packs_controller.rb 2013-08-28 11:14:25 UTC (rev 3637)
@@ -12,8 +12,11 @@
## NOTE: URI must match config/default_settings.yml ro_resource_types
WORKFLOW_DEFINITION = "http://purl.org/wf4ever/wfdesc#WorkflowDefinition"
RO_RESOURCE = "http://purl.org/wf4ever/ro#Resource"
- WORKFLOW_RUN = "http://purl.org/wf4ever/roterms#WorkflowRunBundle"
+ WORKFLOW_RUN = ["http://purl.org/wf4ever/roterms#ResultGenerationRun",
+ "http://purl.org/wf4ever/roterms#ExampleRun",
+ "http://purl.org/wf4ever/roterms#ProspectiveRun"]
+
before_filter :login_required, :except => [:index, :show, :search, :items, :download, :statistics, :item_show, :item_destroy]
before_filter :find_pack_auth, :except => [:index, :new, :create, :search]
@@ -96,6 +99,8 @@
@conclusions = @graph.query(:predicate => RDF.type,
:object => RDF::URI("http://purl.org/wf4ever/roterms#Conclusions")).first_subject
+ @maintainers = Authorization.authorized_for_object(:edit, @pack)
+
@lod_nir = pack_url(@pack)
@lod_html = pack_url(:id => @pack.id, :format => 'html')
@lod_rdf = pack_url(:id => @pack.id, :format => 'rdf')
@@ -673,7 +678,7 @@
annotate_resource_type(resource_uri, params[:type])
end
- if params[:type] == WORKFLOW_RUN
+ if WORKFLOW_RUN.include?(params[:type])
post_process_workflow_run(entry, resource_uri)
end
Modified: branches/packs/config/default_settings.yml (3636 => 3637)
--- branches/packs/config/default_settings.yml 2013-08-28 11:14:00 UTC (rev 3636)
+++ branches/packs/config/default_settings.yml 2013-08-28 11:14:25 UTC (rev 3637)
@@ -1436,12 +1436,15 @@
- label: "Hypothesis"
uri: "http://purl.org/wf4ever/roterms#Hypothesis"
- - label: "Conclusions"
- uri: "http://purl.org/wf4ever/roterms#Conclusions"
+ - label: "Research Question"
+ uri: "http://purl.org/wf4ever/roterms#ResearchQuestion"
- - label: "Results"
- uri: "http://purl.org/wf4ever/roterms#Results"
+ - label: "Conclusion"
+ uri: "http://purl.org/wf4ever/roterms#Conclusion"
+ - label: "Result"
+ uri: "http://purl.org/wf4ever/roterms#Result"
+
- label: "Example inputs"
uri: "http://purl.org/wf4ever/roterms#ExampleInputs"
folder: "datasets/inputs"
@@ -1453,15 +1456,25 @@
uri: "http://purl.org/wf4ever/roterms#WorkflowRunBundle"
folder: "datasets/results"
+ - label: "Example Workflow Run"
+ uri: "http://purl.org/wf4ever/roterms#ExampleRun"
+
+ - label: "Prospective Workflow Run"
+ uri: "http://purl.org/wf4ever/roterms#ProspectiveRun"
+
+ - label: "Results Generating Workflow Run"
+ uri: "http://purl.org/wf4ever/roterms#ResultGenerationRun"
+
+ - label: "Paper"
+ uri: "http://purl.org/wf4ever/roterms#Paper"
+ folder: "biblio"
+
ro_relationships:
- label: "Input selected"
uri: "http://purl.org/wf4ever/roterms#inputSelected"
template: input_selection_relationship
- - label: "Output selected"
- uri: "http://purl.org/wf4ever/roterms#outputSelected"
-
ro_templates:
creator: