[ARVADOS] updated: 1.1.0-145-gfda4715

[Git user]

Summary of changes:
 .../app/assets/javascripts/components/search.js    | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

       via  fda4715560f9c679df6d08b20c09515fb2c1487f (commit)
       via  b7cd87b8bfccf98faa76d336f359c0f964777901 (commit)
      from  9ea1f795a9c4050d8f01cd2f130a3c6c3ea1fd69 (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 fda4715560f9c679df6d08b20c09515fb2c1487f
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Nov 21 15:11:30 2017 -0300

    12519: Make Capybara happy by using a different kind of for loop.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index 319622d..b4b6f63 100644
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -127,7 +127,7 @@ window.Search = {
                     return new MergingLoader({
                         sessionKey: key,
                         // For every session, search for every object type
-                        children: searchable_objects.map(function(obj_type){
+                        children: searchable_objects.map(function(obj_type) {
                             return new MultipageLoader({
                                 sessionKey: key,
                                 objectKind: obj_type.label,
@@ -138,8 +138,8 @@ window.Search = {
                                         filters.push(['any', '@@', tsquery])
                                     }
                                     // Apply additional type dependant filters, if any.
-                                    for (var f of obj_type.filters) {
-                                        filters.push(f)
+                                    for (i = 0; i < obj_type.filters.length; i++) {
+                                        filters.push(obj_type.filters[i])
                                     }
                                     return vnode.state.sessionDB.request(session, obj_type.api_path, {
                                         data: {
@@ -155,9 +155,9 @@ window.Search = {
                                     })
                                 },
                             })
-                        })
+                        }),
                     })
-                })
+                }),
             })
         })
     },

commit b7cd87b8bfccf98faa76d336f359c0f964777901
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Nov 21 13:18:39 2017 -0300

    12519: Use icons on 'show' buttons instead of 'C'/'P' labels.
    Added bootstrap-style tooltips.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index 0e87941..319622d 100644
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -29,6 +29,10 @@ window.SearchResultsTable = {
     },
     onupdate: function(vnode) {
         vnode.state.loader = vnode.attrs.loader
+        // This activates bootstrap tooltip feature
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
     },
     onremove: function(vnode) {
         window.clearInterval(vnode.state.timer)
@@ -37,6 +41,10 @@ window.SearchResultsTable = {
     },
     view: function(vnode) {
         var loader = vnode.attrs.loader
+        var iconsMap = {
+            C: m('i.fa.fa-fw.fa-archive'),
+            P: m('i.fa.fa-fw.fa-folder'),
+        }
         return m('table.table.table-condensed', [
             m('thead', m('tr', [
                 m('th'),
@@ -50,9 +58,11 @@ window.SearchResultsTable = {
                         m('td', [
                             item.workbenchBaseURL() &&
                                 m('a.btn.btn-xs.btn-default', {
-                                    title: 'Show '+item.objectType.description,
+                                    'data-original-title': 'show '+item.objectType.description,
+                                    'data-placement': 'top',
+                                    'data-toggle': 'tooltip',
                                     href: item.workbenchBaseURL()+'/'+item.objectType.wb_path+'/'+item.uuid,
-                                }, item.objectType.label),
+                                }, iconsMap[item.objectType.label]),
                         ]),
                         m('td.arvados-uuid', item.uuid),
                         m('td', item.name || '(unnamed)'),
@@ -104,14 +114,14 @@ window.Search = {
                             api_path: 'arvados/v1/groups',
                             filters: [['group_class', '=', 'project']],
                             label: 'P',
-                            description: 'Project',
+                            description: 'project',
                         },
                         {
                             wb_path: 'collections',
                             api_path: 'arvados/v1/collections',
                             filters: [],
                             label: 'C',
-                            description: 'Collection',
+                            description: 'collection',
                         },
                     ]
                     return new MergingLoader({

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


hooks/post-receive
--