Diff
Modified: branches/wf4ever/app/controllers/packs_controller.rb (3317 => 3318)
--- branches/wf4ever/app/controllers/packs_controller.rb 2013-01-21 15:02:24 UTC (rev 3317)
+++ branches/wf4ever/app/controllers/packs_controller.rb 2013-01-21 16:07:46 UTC (rev 3318)
@@ -556,6 +556,7 @@
"resolve_link" => "edit",
"search" => "view",
"show" => "view",
+ "wfrun" => "view",
"resource_show" => "view",
"statistics" => "view",
"tag" => "view",
@@ -647,4 +648,20 @@
end
end
+
+
+ # GET /pack/1/wfrun/a/b/c
+ def wfrun
+ address@hidden = @contributable.manifest
+
+
+# @ro_entry_url = url_for : false,
+# :host => base_host,
+# :id => @pack.id
+
+ respond_to do |format|
+ format.html # wfrun.rhtml
+ end
+ end
+
end
Modified: branches/wf4ever/app/controllers/research_objects_controller.rb (3317 => 3318)
--- branches/wf4ever/app/controllers/research_objects_controller.rb 2013-01-21 15:02:24 UTC (rev 3317)
+++ branches/wf4ever/app/controllers/research_objects_controller.rb 2013-01-21 16:07:46 UTC (rev 3318)
@@ -59,21 +59,7 @@
end
- # GET /research_objects/1/wfrun/2
- def wfrun
- @manifest = @contributable.manifest
-
-
- @ro_entry_url = url_for : false,
- :host => base_host,
- :id => @research_object.object_id
-
- respond_to do |format|
- format.html # wfrun.rhtml
- end
- end
-
# GET /research_objects/new
def new
@research_object = ResearchObject.new
Copied: branches/wf4ever/app/views/packs/wfrun.rhtml (from rev 3316, branches/wf4ever/app/views/research_objects/wfrun.rhtml) (0 => 3318)
--- branches/wf4ever/app/views/packs/wfrun.rhtml (rev 0)
+++ branches/wf4ever/app/views/packs/wfrun.rhtml 2013-01-21 16:07:46 UTC (rev 3318)
@@ -0,0 +1,39 @@
+
+<ul class="sectionIcons">
+ <% if @authorised_to_edit -%>
+ <li><%= icon('new', new_version_workflow_path(@workflow), nil, nil, 'Upload New Version')%></li>
+ <% end -%>
+ <% if mine?(@workflow) -%>
+ <li><%= icon('manage', edit_workflow_path(@workflow), nil, nil, 'Manage Workflow Entry')%></li>
+ <% end -%>
+ <% if Authorization.check("destroy", @workflow, current_user) -%>
+ <li>
+ <%= icon('destroy', workflow_path(@workflow), nil, { :confirm => 'This deletes all versions of the Workflow and all metadata such as tags, comments and citations. Are you sure?', :method => :delete }, 'Delete Workflow Entry') %>
+ </li>
+ <% end -%>
+</ul>
+
+<h1>Workflow run in: <%=h @contributable.title -%></h1>
+
+
+
+<div class="contribution_left_box">
+
+ <%= render :partial => "research_objects/startedby", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/rundescription", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/workflow", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/inputs", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/outputs", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/rundetails", :locals => { :contributable => @contributable } -%>
+
+ <%= render :partial => "research_objects/comments", :locals => { :commentable => @contributable } %>
+
+</div> <!-- end of left box -->
+
+<div class="contribution_right_box">
+
+ <%= render :partial => "research_objects/tree", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
+ <%= render :partial => "research_objects/runstats", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
+ <%= render :partial => "research_objects/rundownload", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
+
+</div>
\ No newline at end of file
Deleted: branches/wf4ever/app/views/research_objects/wfrun.rhtml (3317 => 3318)
--- branches/wf4ever/app/views/research_objects/wfrun.rhtml 2013-01-21 15:02:24 UTC (rev 3317)
+++ branches/wf4ever/app/views/research_objects/wfrun.rhtml 2013-01-21 16:07:46 UTC (rev 3318)
@@ -1,39 +0,0 @@
-
-<ul class="sectionIcons">
- <% if @authorised_to_edit -%>
- <li><%= icon('new', new_version_workflow_path(@workflow), nil, nil, 'Upload New Version')%></li>
- <% end -%>
- <% if mine?(@workflow) -%>
- <li><%= icon('manage', edit_workflow_path(@workflow), nil, nil, 'Manage Workflow Entry')%></li>
- <% end -%>
- <% if Authorization.check("destroy", @workflow, current_user) -%>
- <li>
- <%= icon('destroy', workflow_path(@workflow), nil, { :confirm => 'This deletes all versions of the Workflow and all metadata such as tags, comments and citations. Are you sure?', :method => :delete }, 'Delete Workflow Entry') %>
- </li>
- <% end -%>
-</ul>
-
-<h1>Workflow run in: <%=h @contributable.title -%></h1>
-
-
-
-<div class="contribution_left_box">
-
- <%= render :partial => "research_objects/startedby", :locals => { :contributable => @contributable } -%>
- <%= render :partial => "research_objects/rundescription", :locals => { :contributable => @contributable } -%>
- <%= render :partial => "research_objects/workflow", :locals => { :contributable => @contributable } -%>
- <%= render :partial => "research_objects/inputs", :locals => { :contributable => @contributable } -%>
- <%= render :partial => "research_objects/outputs", :locals => { :contributable => @contributable } -%>
- <%= render :partial => "research_objects/rundetails", :locals => { :contributable => @contributable } -%>
-
- <%= render :partial => "research_objects/comments", :locals => { :commentable => @contributable } %>
-
-</div> <!-- end of left box -->
-
-<div class="contribution_right_box">
-
- <%= render :partial => "research_objects/tree", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
- <%= render :partial => "research_objects/runstats", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
- <%= render :partial => "research_objects/rundownload", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>
-
-</div>
\ No newline at end of file
Modified: branches/wf4ever/config/routes.rb (3317 => 3318)
--- branches/wf4ever/config/routes.rb 2013-01-21 15:02:24 UTC (rev 3317)
+++ branches/wf4ever/config/routes.rb 2013-01-21 16:07:46 UTC (rev 3318)
@@ -114,6 +114,9 @@
map.pack_resource_update '/packs/:id/resources/:resource_path;update', :controller => 'packs', :action ="" 'update_resource_annotations', :conditions => { :method => :post }, :requirements => { :resource_path => /[^;]+/ }
+ map.pack_resource '/packs/:id/wfrun/:resource_path', :controller => 'packs', :action ="" 'wfrun', :conditions => { :method => :get }, :requirements => { :resource_path => /[^;]+/ }
+
+
# workflows (downloadable)
map.resources :workflows,
:collection => { :search => :get },
@@ -206,7 +209,6 @@
map.research_object_resources '/research_objects/:id/resources', :controller => 'research_objects', :action ="" 'resource_index', :conditions => { :method => :get }
map.research_object_resource '/research_objects/:id/resources/:resource_path', :controller => 'research_objects', :action ="" 'resource_show', :conditions => { :method => :get }, :requirements => { :resource_path => /.*/ }
- map.research_object_resource '/research_objects/:id/wfrun/:run_id', :controller => 'research_objects', :action ="" 'wfrun'
# Finn's folder stuff
map.folder_contents '/folders/folder_contents', :controller => 'folders', :action ="" 'folder_contents'