[ARVADOS] updated: 48c6eca6aa6af517f67d39545b714946676cd2b5

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |   3 +-
 apps/workbench/Gemfile.lock                        |   5 +-
 .../app/assets/javascripts/infinite_scroll.js      |  34 +++++++
 .../app/controllers/collections_controller.rb      |   4 +-
 .../controllers/pipeline_instances_controller.rb   |   6 +-
 apps/workbench/app/helpers/application_helper.rb   |   4 +-
 .../app/views/collections/hash_matches.html.erb    |   8 +-
 apps/workbench/config/database.yml                 |  40 ++------
 .../workbench/test/integration/collections_test.rb |  20 +++-
 .../install-workbench-app.html.textile.liquid      |   2 +-
 sdk/python/arvados/keep.py                         |   2 +-
 .../app/controllers/arvados/v1/jobs_controller.rb  |  27 +++++-
 services/api/test/fixtures/jobs.yml                |  35 ++++++-
 services/api/test/fixtures/links.yml               |  30 ++++++
 services/api/test/fixtures/repositories.yml        |   7 ++
 .../arvados/v1/job_reuse_controller_test.rb        | 108 +++++++++++++++------
 services/api/test/test.git.tar                     | Bin 194560 -> 256000 bytes
 services/api/test/unit/collection_test.rb          |   7 ++
 services/api/test/unit/commit_test.rb              |  60 ++++++++++++
 services/api/test/unit/job_test.rb                 |  10 ++
 20 files changed, 328 insertions(+), 84 deletions(-)

       via  48c6eca6aa6af517f67d39545b714946676cd2b5 (commit)
       via  ec0c9f0d12560296d4b678c8ad33e1b82221e626 (commit)
       via  19db486cda40c892afb1111bb3d35d482ab1fbb2 (commit)
       via  b6c7ee612c09a110b6e2a87a12eebc5b81a7a2e8 (commit)
       via  040fdf6da00318b5b8e8e83eceeec783680ecb1c (commit)
       via  8464bb48ba769c8bf0984c8b1493ca43fd902891 (commit)
       via  03d89302f14a4a1c448b32d62679bab14e23fa23 (commit)
       via  68dfd41d1d5038f7e0a139779ef6ce1c4a7a8351 (commit)
       via  5b0d540ad315ad390831ad58f52b02e86686524f (commit)
       via  4b17e78749b44772e898619e11aef663810ac6ed (commit)
       via  d054beda9bc86bc6cd33a127f4d9e40d04f1620d (commit)
       via  9bfd0d772abcd643e92fed127112e0ed91c00e65 (commit)
       via  41068df20f2a9fe9dbb3e29e55af0c82832359ad (commit)
      from  5b1602a521d3f6689f5988cdc2b25b74ff9fc1e1 (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 48c6eca6aa6af517f67d39545b714946676cd2b5
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Apr 28 18:03:58 2015 -0400

    5826: revert the previous update that checked if readable only for pdh or uuid;
    instead check as long as a collection datatype is presented with a non-empty string.

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index fc8bd4b..c5fbda0 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -300,12 +300,14 @@ class PipelineInstancesController < ApplicationController
             value = tv[:value]
           elsif tv[:default]
             value = tv[:default]
+          else
+            value = ''
           end
-          if value
+          if value.present?
             split = value.split '/'
             if CollectionsHelper.match(split[0])
               input_pdhs << split[0]
-            elsif CollectionsHelper.match_uuid_with_optional_filepath(split[0])
+            else
               input_uuids << split[0]
             end
           end
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index a8b88a3..034ebb9 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -368,11 +368,11 @@ module ApplicationHelper
            success: 'page-refresh'
          }.to_json,
         })
-      is_readable_input = attrvalue.present? and object_readable attrvalue, Collection
+
       return content_tag('div', :class => 'input-group') do
         html = text_field_tag(dn, display_value,
                               :class =>
-                              "form-control #{'required' if required} #{'unreadable-input' if !attrvalue.andand.empty? and !is_readable_input}")
+                              "form-control #{'required' if required} #{'unreadable-input' if !attrvalue.andand.empty? and !object_readable(attrvalue, Collection)}")
         html + content_tag('span', :class => 'input-group-btn') do
           link_to('Choose',
                   modal_path,

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


hooks/post-receive
--