From: Tom Clegg <tom@curoverse.com>
Date: Wed, 9 Aug 2017 01:51:43 +0000 (-0400)
Subject: 12033: Link collections to remote workbench sites.
X-Git-Tag: 1.1.0~64^2~36
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/babd40cc9e963fd87952b0b23539189b56be10cf

12033: Link collections to remote workbench sites.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js
index ddba2e1183..7ab5047cb8 100644
--- a/apps/workbench/app/assets/javascripts/components/collections.js
+++ b/apps/workbench/app/assets/javascripts/components/collections.js
@@ -11,7 +11,7 @@ window.components.collection_table_narrow = {
                 vnode.attrs.items().map(function(item) {
                     return m('tr', [
                         m('td', [
-                            m('a', {href: '/collections/'+item.uuid}, item.name || '(unnamed)'),
+                            m('a', {href: vnode.attrs.session.baseURL.replace('://', '://workbench.')+'/collections/'+item.uuid}, item.name || '(unnamed)'),
                             m('br'),
                             item.modified_at,
                         ]),
@@ -52,6 +52,7 @@ window.components.collection_search = {
     },
     view: function(vnode) {
         var items = vnode.state.items
+        var sessions = vnode.state.sessionDB.loadAll()
         return m('form', {
             onsubmit: function() {
                 vnode.state.searchStart(vnode.state.searchEntered())
@@ -86,6 +87,7 @@ window.components.collection_search = {
                 }}, [
                     m(window.components.collection_table_narrow, {
                         key: key,
+                        session: sessions[key],
                         items: items[key],
                     }),
                 ])