[ARVADOS] updated: 169d4321970e87a7000cbd0bb4c763bc57193632

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/log_viewer.js    |  2 +-
 .../views/pipeline_templates/_show_components.html.erb | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

       via  169d4321970e87a7000cbd0bb4c763bc57193632 (commit)
       via  947164d3161aafda83522a034a093b193d064c49 (commit)
       via  88bef712f3c9fb6e7b7e5d1eb7b429da598f4eaf (commit)
       via  bfc0b74c4f4e5b6485393827735ff9a875d4d8ac (commit)
      from  185aee8518374b4a5998b5458248f68d14d5608c (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 169d4321970e87a7000cbd0bb4c763bc57193632
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 26 15:03:27 2014 -0400

    3088: set the owner uuid on the newly created pipeline instance to the selected project.

diff --git a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
index 5050c77..8be156f 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
@@ -5,9 +5,8 @@
                                      action_name: 'Choose',
                                      action_href: pipeline_instances_path,
                                      action_method: 'post',
-                                     action_data: {selection_param: 'project[uuid]',
+                                     action_data: {selection_param: 'pipeline_instance[owner_uuid]',
                                                    'pipeline_instance[pipeline_template_uuid]' => @object.uuid,
-                                                   'pipeline_instance[owner_uuid]' => @object.owner_uuid,
                                                    'success' => 'redirect-to-created-object'
                                                   }.to_json),
                 { class: "btn btn-primary btn-sm", remote: true, method: 'get' }

commit 947164d3161aafda83522a034a093b193d064c49
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 26 14:01:07 2014 -0400

    3088: Run this pipeline on a template shows project chooser

diff --git a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
index 1624fd7..5050c77 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb
@@ -1,8 +1,19 @@
 <% content_for :tab_line_buttons do %>
-  <%= form_tag '/pipeline_instances' do |f| %>
-  <%= hidden_field :pipeline_instance, :pipeline_template_uuid, :value => @object.uuid %>
-  <%= button_tag "Run this pipeline", {class: 'btn btn-primary pull-right', id: "run-pipeline-button"} %>
-<% end %>
+  <%= button_to(choose_projects_path(id: "run-pipeline-button",
+                                     title: 'Choose project',
+                                     editable: true,
+                                     action_name: 'Choose',
+                                     action_href: pipeline_instances_path,
+                                     action_method: 'post',
+                                     action_data: {selection_param: 'project[uuid]',
+                                                   'pipeline_instance[pipeline_template_uuid]' => @object.uuid,
+                                                   'pipeline_instance[owner_uuid]' => @object.owner_uuid,
+                                                   'success' => 'redirect-to-created-object'
+                                                  }.to_json),
+                { class: "btn btn-primary btn-sm", remote: true, method: 'get' }
+               ) do %>
+                    <i class="fa fa-fw fa-folder"></i> Run this pipeline
+                 <% end %>
 <% end %>
 
 <%= render partial: 'pipeline_instances/show_components_editable', locals: {editable: false} %>

commit 88bef712f3c9fb6e7b7e5d1eb7b429da598f4eaf
Merge: 185aee8 bfc0b74
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 25 10:43:56 2014 -0400

    Merge branch 'master' into 3088-project-chooser-on-run-pipeline-template


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


hooks/post-receive
--