[ARVADOS] updated: ca77755f57b0478e3f4fbe3e6a6d7ade95012808

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb        | 20 ++++++++++----------
 apps/workbench/app/views/users/_tables.html.erb      |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

       via  ca77755f57b0478e3f4fbe3e6a6d7ade95012808 (commit)
      from  66da5859254325690a78512d03b6b02e3f69a237 (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 ca77755f57b0478e3f4fbe3e6a6d7ade95012808
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 13:58:36 2014 -0400

    2871: rename get collections and log collections method names to match the format of links method.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index e39d776..3e458bf 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -495,15 +495,15 @@ class ApplicationController < ActionController::Base
   end
 
   # helper method to get collections for the given uuid
-  helper_method :get_collections
-  def get_collections uuid
-    preload_collections([uuid])
+  helper_method :collections_for_object
+  def collections_for_object uuid
+    preload_collections_for_objects([uuid])
     @all_collections_for[uuid]
   end
 
   # helper method to preload collections for the given uuids
-  helper_method :preload_collections
-  def preload_collections uuids
+  helper_method :preload_collections_for_objects
+  def preload_collections_for_objects uuids
     @all_collections_for ||= {}
     if not uuids.select { |x| @all_collections_for[x].nil? }.any?
       # already preloaded for all of these uuids
@@ -521,17 +521,17 @@ class ApplicationController < ActionController::Base
   end
 
   # helper method to get log collections for the given log
-  helper_method :get_log_collections
-  def get_log_collections log
+  helper_method :log_collections_for_object
+  def log_collections_for_object log
     fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log)
     uuid = fixup[1]
-    preload_log_collections([uuid])
+    preload_log_collections_for_objects([uuid])
     @all_log_collections_for[uuid]
   end
 
   # helper method to preload collections for the given uuids
-  helper_method :preload_log_collections
-  def preload_log_collections logs
+  helper_method :preload_log_collections_for_objects
+  def preload_log_collections_for_objects logs
     uuids = []
     logs.each do |log|
       fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log)
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index bfce00f..a87cd1d 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -33,8 +33,8 @@
             job_logs << j.log
           end
 
-          preload_collections job_outputs
-          preload_log_collections job_logs
+          preload_collections_for_objects job_outputs
+          preload_log_collections_for_objects job_logs
         %>
         <% @my_jobs[0..6].each do |j| %>
           <tr data-object-uuid="<%= j.uuid %>">
@@ -48,7 +48,7 @@
               <small>
                 <% if j.success and j.output %>
                   <a href="<%= collection_path(j.output) %>">
-                    <% collections = get_collections(j.output) %>
+                    <% collections = collections_for_object(j.output) %>
                       <% if collections && !collections.empty? %>
                       <% c = collections.first %>
                       <% c.files.each do |file| %>
@@ -63,7 +63,7 @@
 <td>
   <small>
     <% if j.log %>
-      <% log_collections = get_log_collections(j.log) %>
+      <% log_collections = log_collections_for_object(j.log) %>
       <% if log_collections && !log_collections.empty? %>
         <% c = log_collections.first %>
         <% c.files.each do |file| %>

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


hooks/post-receive
--