[ARVADOS] updated: 1.1.1-158-gb18af1f

[Git user]

Summary of changes:
 .../app/assets/javascripts/components/edit_tags.js | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

       via  b18af1fdb7474f525938f66650d2d267b2784ec2 (commit)
      from  4f83103fc5cb227d23b40c8a28c497855b2d5f61 (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 b18af1fdb7474f525938f66650d2d267b2784ec2
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Dec 20 16:13:14 2017 -0300

    12479: When requesting the collection, only ask the api server for the
    properties.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/edit_tags.js b/apps/workbench/app/assets/javascripts/components/edit_tags.js
index d5f2ac4..f013b45 100644
--- a/apps/workbench/app/assets/javascripts/components/edit_tags.js
+++ b/apps/workbench/app/assets/javascripts/components/edit_tags.js
@@ -33,8 +33,6 @@ window.SelectOrAutocomplete = {
     }
 }
 
-// When in edit mode, present a tag name selector and tag value
-// selector/editor depending of the tag type.
 window.TagEditorRow = {
     view: function(vnode) {
         // Value options list
@@ -136,23 +134,28 @@ window.TagEditorApp = {
         vnode.state.vocabulary = m.stream({"strict":false, "types":{}})
         m.request('/vocabulary.json').then(vnode.state.vocabulary)
         vnode.state.editMode = vnode.attrs.targetEditable
-        // Get tags
         vnode.state.tags = []
         vnode.state.dirty = m.stream(false)
         vnode.state.dirty.map(m.redraw)
         vnode.state.objPath = '/arvados/v1/'+vnode.attrs.targetController+'/'+vnode.attrs.targetUuid
+        // Get tags
         vnode.state.sessionDB.request(
-            vnode.state.sessionDB.loadLocal(), vnode.state.objPath, {
+            vnode.state.sessionDB.loadLocal(),
+            '/arvados/v1/'+vnode.attrs.targetController,
+            {
                 data: {
-                    select: JSON.stringify(['properties']) // FIXME: not working
+                    filters: JSON.stringify([['uuid', '=', vnode.attrs.targetUuid]]),
+                    select: JSON.stringify(['properties'])
                 },
             }).then(function(obj) {
-                console.log(obj)
-                Object.keys(obj.properties).forEach(function(k) {
-                    vnode.state.appendTag(vnode, k, obj.properties[k])
-                })
-                // Data synced with server, so dirty state should be false
-                vnode.state.dirty(false)
+                if (obj.items.length == 1) {
+                    o = obj.items[0]
+                    Object.keys(o.properties).forEach(function(k) {
+                        vnode.state.appendTag(vnode, k, o.properties[k])
+                    })
+                    // Data synced with server, so dirty state should be false
+                    vnode.state.dirty(false)
+                }
             }
         )
     },

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


hooks/post-receive
--