From 4f7d62e79d6bc7d1cc6d1b1428257290ef785cb6 Mon Sep 17 00:00:00 2001 From: zmagod Date: Fri, 20 Jan 2017 11:33:10 +0100 Subject: [PATCH 1/2] removes unneeded annotations [fixes SCI-915] --- app/assets/javascripts/sitewide/atwho_res.js.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index 9da17d2d1..c308bbc16 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -428,10 +428,10 @@ var SmartAnnotation = (function() { displayTimeout: 120000 }) .atwho(atWhoSettings('#', DEFAULT_SEARCH_FILTER)) - .atwho(atWhoSettings('task#', FilterTypeEnum.TASK)) - .atwho(atWhoSettings('project#', FilterTypeEnum.PROJECT)) - .atwho(atWhoSettings('experiment#', FilterTypeEnum.EXPERIMENT)) - .atwho(atWhoSettings('sample#', FilterTypeEnum.SAMPLE)); + // .atwho(atWhoSettings('task#', FilterTypeEnum.TASK)) Waiting for better times + // .atwho(atWhoSettings('project#', FilterTypeEnum.PROJECT)) + // .atwho(atWhoSettings('experiment#', FilterTypeEnum.EXPERIMENT)) + // .atwho(atWhoSettings('sample#', FilterTypeEnum.SAMPLE)); } return { From 71453398b1a7b3f496609d513c4ecba969a6fd7c Mon Sep 17 00:00:00 2001 From: zmagod Date: Fri, 20 Jan 2017 11:33:49 +0100 Subject: [PATCH 2/2] bugfix --- app/assets/javascripts/sitewide/atwho_res.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index c308bbc16..ffac11d85 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -427,7 +427,7 @@ var SmartAnnotation = (function() { acceptSpaceBar: true, displayTimeout: 120000 }) - .atwho(atWhoSettings('#', DEFAULT_SEARCH_FILTER)) + .atwho(atWhoSettings('#', DEFAULT_SEARCH_FILTER)); // .atwho(atWhoSettings('task#', FilterTypeEnum.TASK)) Waiting for better times // .atwho(atWhoSettings('project#', FilterTypeEnum.PROJECT)) // .atwho(atWhoSettings('experiment#', FilterTypeEnum.EXPERIMENT))