[ARVADOS] updated: 1.1.1-149-g71023ae

Git user git at public.curoverse.com
Mon Dec 18 08:58:06 EST 2017


Summary of changes:
 apps/workbench/app/assets/javascripts/models/tags.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

       via  71023ae5387402ed6c76948b4886d8d4a606f095 (commit)
      from  97b13b759d46c5e8f74150add53b76daa5861120 (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 71023ae5387402ed6c76948b4886d8d4a606f095
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Dec 18 10:57:34 2017 -0300

    12479: Assign default vocabulary on model instantiation
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/models/tags.js b/apps/workbench/app/assets/javascripts/models/tags.js
index e98c439..ddf0728 100644
--- a/apps/workbench/app/assets/javascripts/models/tags.js
+++ b/apps/workbench/app/assets/javascripts/models/tags.js
@@ -13,16 +13,11 @@ window.Vocabulary = function(url) {
     var v = this
     Object.assign(v, {
         url: url,
-        data: {},
+        data: vocabulary, // Default vocabulary
         load: function() {
             // Load vocabulary from rails' public directory
             m.request(v.url.origin + '/vocabulary.json').then(function(resp) {
-                console.log('Vocabulary loaded')
                 v.data = resp
-            }).catch(function(err) {
-                // Not found, use a default vocabulary
-                console.log('Using default vocabulary')
-                v.data = vocabulary
             })
         },
         getDef: function(tagName) {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list