[ARVADOS] updated: 67616c4716fb325cbd5d2eb5ed042d3a20569914

Git user git at public.curoverse.com
Mon Aug 14 15:32:14 EDT 2017


Summary of changes:
 .../app/assets/javascripts/components/collections.js          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

       via  67616c4716fb325cbd5d2eb5ed042d3a20569914 (commit)
      from  9f0705911d360e6a4bec7703ce9fb6631144c13e (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 67616c4716fb325cbd5d2eb5ed042d3a20569914
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 14 15:31:39 2017 -0400

    12033: Fix site status indicators.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js
index d65354f..9f7c804 100644
--- a/apps/workbench/app/assets/javascripts/components/collections.js
+++ b/apps/workbench/app/assets/javascripts/components/collections.js
@@ -89,6 +89,7 @@ window.CollectionsSearch = {
                 children: Object.keys(sessions).map(function(key) {
                     var session = sessions[key]
                     return new MultipageLoader({
+                        sessionKey: key,
                         loadFunc: function(filters) {
                             if (q)
                                 filters.push(['any', '@@', q+':*'])
@@ -139,14 +140,12 @@ window.CollectionsSearch = {
                     ]),
                     m('.col-md-6', [
                         'Searching sites: ',
-                        Object.keys(sessions).length == 0
+                        vnode.state.loader.children.length == 0
                             ? m('span.label.label-xs.label-danger', 'none')
-                            : Object.keys(sessions).sort().map(function(key) {
+                            : vnode.state.loader.children.map(function(child) {
                                 return [m('span.label.label-xs', {
-                                    className: !vnode.state.loader.children[key] ? 'label-default' :
-                                        vnode.state.loader.children[key].items() ? 'label-success' :
-                                        'label-warning',
-                                }, key), ' ']
+                                    className: child.items() ? 'label-success' : 'label-warning',
+                                }, child.sessionKey), ' ']
                             }),
                         ' ',
                         m('a[href="/sessions"]', 'Add/remove sites'),

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list