[ARVADOS] updated: efa119244cd38090933fbd0ba29f3604889e9aa9

[git at public.curoverse.com]

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

       via  efa119244cd38090933fbd0ba29f3604889e9aa9 (commit)
      from  976f560ab04bf570ed58664d97b8b6069b314941 (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 efa119244cd38090933fbd0ba29f3604889e9aa9
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Apr 15 10:14:50 2015 -0400

    5417: when input is unreadable, present visual cue even when it is not editable by the user.

diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index a928d44..42c71e0 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -51,8 +51,8 @@ $(document).on('ready ajax:complete', function() {
             $tag.parent().parent().prev().css("background-color", "#ffdddd");
         }
         else {
-            $tag.parent().css("background-color", "");
-            $tag.parent().prev().css("background-color", "");
+            $tag.parent().parent().css("background-color", "");
+            $tag.parent().parent().prev().css("background-color", "");
         }
     });
     run_pipeline_button_state();
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 8d92b47..09adfef 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -186,12 +186,18 @@ module ApplicationHelper
     readable = object_readable attrvalue, resource_class
     if readable
       link_to_if_arvados_object attrvalue, opts
+    elsif opts[:required]
+      raw('<div><input type="text" style="border:none;width:100%;background:#ffdddd" disabled=true class="required unreadable-input" value="' +
+           link_text_if_not_readable + '" ></input></div>')
     else
       link_text_if_not_readable
     end
   end
 
   def object_readable attrvalue, resource_class=nil
+    # if it is a collection filename, check readable for the locator
+    attrvalue = attrvalue.split('/')[0] if attrvalue
+
     resource_class = resource_class_for_uuid(attrvalue)
     return if resource_class.nil?
 
@@ -300,7 +306,7 @@ module ApplicationHelper
     end
 
     if not object.andand.attribute_editable?(attr)
-      return link_to_arvados_object_if_readable(attrvalue, attrvalue, friendly_name: true)
+      return link_to_arvados_object_if_readable(attrvalue, attrvalue, {friendly_name: true, required: required})
     end
 
     if dataclass
@@ -352,7 +358,7 @@ module ApplicationHelper
            success: 'page-refresh'
          }.to_json,
         })
-      is_readable_input = object_readable attrvalue.split('/')[0] unless attrvalue.andand.empty?
+      is_readable_input = object_readable attrvalue unless attrvalue.andand.empty?
       return content_tag('div', :class => 'input-group') do
         html = text_field_tag(dn, display_value,
                               :class =>

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


hooks/post-receive
--