Diff
Modified: branches/wf4ever/app/controllers/workflows_controller.rb (3212 => 3213)
--- branches/wf4ever/app/controllers/workflows_controller.rb 2012-11-27 13:58:22 UTC (rev 3212)
+++ branches/wf4ever/app/controllers/workflows_controller.rb 2012-11-27 14:06:03 UTC (rev 3213)
@@ -236,7 +236,7 @@
session = ROSRS::Session.new(@workflow.ro_uri, Conf.rodl_bearer_token)
- @annotations = session.get_annotation_graph(@workflow.ro_uri, workflow_url(@workflow))
+ @annotations = session.get_annotation_graph(@workflow.ro_uri, workflow_url(@workflow)) if @workflow.ro_uri
if allow_statistics_logging(@viewing_version)
@viewing = Viewing.create(:contribution => @workflow.contribution, :user => (logged_in? ? current_user : nil), :user_agent => request.env['HTTP_USER_AGENT'], :accessed_from_site => accessed_from_website?())
Modified: branches/wf4ever/app/views/workflows/_breadcrumbs.rhtml (3212 => 3213)
--- branches/wf4ever/app/views/workflows/_breadcrumbs.rhtml 2012-11-27 13:58:22 UTC (rev 3212)
+++ branches/wf4ever/app/views/workflows/_breadcrumbs.rhtml 2012-11-27 14:06:03 UTC (rev 3213)
@@ -1,6 +1,6 @@
<li><%= link_to 'Workflows', workflows_path %></li>
-<% if ["show", "new", "edit", "search", "all", "new_version", "edit_version", "comments_timeline", "galaxy_tool"].include? controller.action_name.to_s %>
+<% if ["show", "new", "edit", "search", "all", "new_version", "edit_version", "edit_annotations", "comments_timeline", "galaxy_tool"].include? controller.action_name.to_s %>
<% case controller.action_name.to_s; when "show" %>
<li><%= h(@workflow.title) %></li>
<% when "new" %>
@@ -18,6 +18,9 @@
<% when "edit_version" %>
<li><%= link_to "#{h(@workflow.title)}", workflow_path(@workflow) %></li>
<li>Edit Version</li>
+ <% when "edit_annotations" %>
+ <li><%= link_to "#{h(@workflow.title)}", workflow_path(@workflow) %></li>
+ <li>Edit Annotations</li>
<% when "comments_timeline" %>
<li><%= link_to "#{h(@workflow.title)}", workflow_path(@workflow) %></li>
<li>Comments Timeline</li>
Modified: branches/wf4ever/app/views/workflows/show.rhtml (3212 => 3213)
--- branches/wf4ever/app/views/workflows/show.rhtml 2012-11-27 13:58:22 UTC (rev 3212)
+++ branches/wf4ever/app/views/workflows/show.rhtml 2012-11-27 14:06:03 UTC (rev 3213)
@@ -73,6 +73,7 @@
<div style="margin-top: 1em;">
<ul class="sectionIcons" style="margin-top: 0.7em; margin-bottom: 0.6em;">
<li style="margin-left: 0;"><%= icon('edit', workflow_version_edit_url(@workflow.id, @viewing_version.version), nil, nil, "Edit This Version") %></li>
+ <li style="margin-left: 0;"><%= icon('edit', edit_annotations_workflow_path(@workflow), nil, nil, "Edit Annotations") %></li>
<% if false %>
<% if @latest_version_number > 1 %>
<% if Authorization.check("destroy", @workflow, current_user) %>