[ARVADOS] updated: 1ca9bf45642e126cd3433fc0474e917ffd55b49d

[Git user]

Summary of changes:
 apps/workbench/app/controllers/work_units_controller.rb           | 2 +-
 apps/workbench/app/views/projects/_show_dashboard.html.erb        | 2 +-
 apps/workbench/app/views/workflows/_show_chooser_preview.html.erb | 3 +--
 apps/workbench/app/views/workflows/_show_workflow.html.erb        | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 apps/workbench/app/views/workflows/_show_workflow.html.erb

       via  1ca9bf45642e126cd3433fc0474e917ffd55b49d (commit)
      from  c837f9d9530679a0350fac40bdbe748751b85cce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1ca9bf45642e126cd3433fc0474e917ffd55b49d
Author: radhika <radhika at curoverse.com>
Date:   Wed Aug 24 13:47:46 2016 -0400

    9767: json parse not needed after yaml load

diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 9ccfd1d..7eea0a8 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -48,7 +48,7 @@ class WorkUnitsController < ApplicationController
       workflow = Workflow.find? template_uuid
       if workflow.workflow
         begin
-          wf_json = JSON.parse(JSON.dump(YAML::load(workflow.workflow)))
+          wf_json = YAML::load(workflow.workflow)
         rescue => e
           logger.error "Error converting workflow yaml to json: #{e.message}"
           raise ArgumentError, "Error converting workflow yaml to json: #{e.message}"
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index e935307..e8742f4 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -8,7 +8,7 @@
               <span>
                 <%= link_to(
                 choose_work_unit_templates_path(
-                  title: 'Choose a pipeline to run:',
+                  title: 'Choose a pipeline or workflow to run:',
                   action_name: 'Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i>',
                   action_href: work_units_path,
                   action_method: 'post',
diff --git a/apps/workbench/app/views/workflows/_show_chooser_preview.html.erb b/apps/workbench/app/views/workflows/_show_chooser_preview.html.erb
index ebdd0ba..395dda9 100644
--- a/apps/workbench/app/views/workflows/_show_chooser_preview.html.erb
+++ b/apps/workbench/app/views/workflows/_show_chooser_preview.html.erb
@@ -1,4 +1,3 @@
 <div class="col-sm-11 col-sm-push-1 arv-description-in-table">
-  <%= @object.description %>
+  <%= (@object.description if @object.description.present?) || 'No description' %>
 </div>
-<%= render partial: 'show_workflow' %>
diff --git a/apps/workbench/app/views/workflows/_show_workflow.html.erb b/apps/workbench/app/views/workflows/_show_workflow.html.erb
deleted file mode 100644
index 1215864..0000000
--- a/apps/workbench/app/views/workflows/_show_workflow.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  <span class="editable editable-done-setup editable-pre-wrapped" data-emptytext="(none)" data-type="textarea"><%=@object.workflow%></span>
-</div>

-----------------------------------------------------------------------


hooks/post-receive
--