[ARVADOS] updated: 25f3a23bc8794b77a1b5fa1e5e7f9c38a152dd8f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 11 +++++++----
 apps/workbench/app/helpers/application_helper.rb         |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

       via  25f3a23bc8794b77a1b5fa1e5e7f9c38a152dd8f (commit)
      from  33fed6bb30180c9dedb046d6266acbbc48dcfcd4 (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 25f3a23bc8794b77a1b5fa1e5e7f9c38a152dd8f
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 5 10:04:32 2014 -0400

    2871: some more comments

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 36cdb84..cc4e09f 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -462,10 +462,12 @@ class ApplicationController < ActionController::Base
   def preload_links_for_objects objects_and_uuids
     uuids = objects_and_uuids.collect { |x| x.is_a?(String) ? x : x.uuid }
     @all_links_for ||= {}
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_links_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
+
     uuids.each do |x|
       @all_links_for[x] = []
     end
@@ -480,7 +482,7 @@ class ApplicationController < ActionController::Base
   helper_method :get_n_objects_of_class
   def get_n_objects_of_class dataclass, size
     # if the objects_map_for has a value for this dataclass, and the size used
-    # to retrieve those objects is greater than equal to size, return it
+    # to retrieve those objects is greater than or equal to size, return it
     size_key = "#{dataclass}_size"
     if @objects_map_for && @objects_map_for[dataclass] && @objects_map_for[size_key] &&
         (@objects_map_for[size_key] >= size)
@@ -505,8 +507,9 @@ class ApplicationController < ActionController::Base
   helper_method :preload_collections_for_objects
   def preload_collections_for_objects uuids
     @all_collections_for ||= {}
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
 
@@ -538,9 +541,9 @@ class ApplicationController < ActionController::Base
       uuids << fixup[1]
     end
 
+    # if already preloaded for all of these uuids, return
     @all_log_collections_for ||= {}
     if not uuids.select { |x| @all_log_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
 
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 937c204..eb729d8 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -245,7 +245,8 @@ module ApplicationHelper
       dn += '[value]'
     end
 
-    preload_uuids = [attrvalue]
+    # preload data
+    preload_uuids = []
     items = []
     selectables = []
 

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


hooks/post-receive
--