Repository: atlas Updated Branches: refs/heads/branch-1.0 4b5aa7d01 -> 4964d3f1d
ATLAS-2716 : Update UI to include term value while saving search Signed-off-by: Madhan Neethiraj <mad...@apache.org> (cherry picked from commit 4c121c4dc6a49a93f3946785da917d4691841136) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/185757c7 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/185757c7 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/185757c7 Branch: refs/heads/branch-1.0 Commit: 185757c7f52a82ad38b3887f971f9d3a803b8fb4 Parents: 4b5aa7d Author: kevalbhatt <kbh...@apache.org> Authored: Thu May 24 18:00:04 2018 +0530 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Thu May 24 07:48:28 2018 -0700 ---------------------------------------------------------------------- dashboardv2/public/js/utils/Enums.js | 3 ++- dashboardv2/public/js/views/search/SearchResultLayoutView.js | 2 +- dashboardv2/public/js/views/search/save/SaveSearchView.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/185757c7/dashboardv2/public/js/utils/Enums.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/Enums.js b/dashboardv2/public/js/utils/Enums.js index 81de527..b5e8a6d 100644 --- a/dashboardv2/public/js/utils/Enums.js +++ b/dashboardv2/public/js/utils/Enums.js @@ -73,7 +73,8 @@ define(['require'], function(require) { "excludeSC": "includeSubClassifications", "tagFilters": "tagFilters", "entityFilters": "entityFilters", - "attributes": "attributes" + "attributes": "attributes", + "term": "termName" }, "uiParameters": "uiParameters" } http://git-wip-us.apache.org/repos/asf/atlas/blob/185757c7/dashboardv2/public/js/views/search/SearchResultLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index 1cb2075..7fa088b 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -716,7 +716,7 @@ define(['require', }) }; this.getTagCol({ 'col': col, 'columnToShow': columnToShow }); - if ((!_.contains(["classification", "glossary"], this.fromView))) { + if ((!_.contains(["glossary"], this.fromView))) { this.getTermCol({ 'col': col, 'columnToShow': columnToShow }); } http://git-wip-us.apache.org/repos/asf/atlas/blob/185757c7/dashboardv2/public/js/views/search/save/SaveSearchView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/save/SaveSearchView.js b/dashboardv2/public/js/views/search/save/SaveSearchView.js index 5d135ce..ae940e1 100644 --- a/dashboardv2/public/js/views/search/save/SaveSearchView.js +++ b/dashboardv2/public/js/views/search/save/SaveSearchView.js @@ -96,7 +96,7 @@ define(['require', }, saveAs: function(e) { var value = this.getValue(); - if (value && (value.type || value.tag || value.query)) { + if (value && (value.type || value.tag || value.query || value.term)) { this.callSaveModalLayoutView({ 'collection': this.collection, 'getValue': this.getValue,
