[ARVADOS] updated: c2a861d06b51978847a02369e673eb1288ada1ee

Git user git at public.curoverse.com
Wed Sep 20 16:05:07 EDT 2017


Summary of changes:
 apps/workbench/app/views/projects/_show_dashboard.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  c2a861d06b51978847a02369e673eb1288ada1ee (commit)
      from  fb79ddbedcc8c459daccaa6eec05b07206865bae (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 c2a861d06b51978847a02369e673eb1288ada1ee
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 20 16:03:53 2017 -0400

    Fix dashboard crash on uncommitted container request.
    
    refs #12246
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 3be8e37..00780c4 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
   preload_objects_for_dataclass(Container, recent_cr_containers) if recent_cr_containers.andand.any?
 
   # fetch children of all the active crs in one call, if there are any
-  active_crs = recent_crs.each {|cr| cr if (cr.priority > 0 and cr.state != 'Final' and cr.container_uuid)}
+  active_crs = recent_crs.each {|cr| cr if (cr.priority.andand > 0 and cr.state != 'Final' and cr.container_uuid)}
   active_cr_uuids = active_crs.map(&:uuid)
   active_cr_containers = active_crs.map {|cr| cr.container_uuid}.compact.uniq
   cr_children = {}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list