[ARVADOS] updated: 38e59df2cbeac1cc58962eabdfad49942b32c8f6

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/pipeline_instances.js | 2 +-
 apps/workbench/app/controllers/application_controller.rb    | 4 +++-
 apps/workbench/app/helpers/application_helper.rb            | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

       via  38e59df2cbeac1cc58962eabdfad49942b32c8f6 (commit)
       via  4c05d2bb163576a2de9e063f840904a19363c104 (commit)
      from  3c2ad38a0335977ce015c1b54267d466d85d2d1b (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 38e59df2cbeac1cc58962eabdfad49942b32c8f6
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jun 6 12:56:03 2014 -0400

    2872: Fix auto-disable/enable "Run" button on pipeline page.

diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 4b17b4e..54595ab 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -1,5 +1,5 @@
 function run_pipeline_button_state() {
-    var a = $('a.editable.required.editable-empty');
+    var a = $('a.editable.required.editable-empty,input.form-control.required[value=]');
     if (a.length > 0) {
         $(".run-pipeline-button").addClass("disabled");
     }
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 552e79e..fd13bc4 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -267,7 +267,9 @@ module ApplicationHelper
          }.to_json,
         })
       return content_tag('div', :class => 'input-group') do
-        html = text_field_tag(dn, display_value, :class => 'form-control')
+        html = text_field_tag(dn, display_value,
+                              :class =>
+                              "form-control #{'required' if required}")
         html + content_tag('span', :class => 'input-group-btn') do
           link_to('Choose',
                   modal_path,

commit 4c05d2bb163576a2de9e063f840904a19363c104
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jun 6 12:56:00 2014 -0400

    2872: On front page, only show recent pipelines and jobs that are in folders.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d410da9..12f9c70 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -529,7 +529,9 @@ class ApplicationController < ActionController::Base
 
   helper_method :recent_jobs_and_pipelines
   def recent_jobs_and_pipelines
-    (Job.limit(10) | PipelineInstance.limit(10)).
+    in_my_folders = ['owner_uuid','in',my_folders.collect(&:uuid)]
+    (Job.limit(10).filter([in_my_folders]) |
+     PipelineInstance.limit(10).filter([in_my_folders])).
       sort_by do |x|
       x.finished_at || x.started_at || x.created_at rescue x.created_at
     end

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


hooks/post-receive
--