This is an automated email from the ASF dual-hosted git repository. sarath pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 45ae72978575c8291a3025177e62327eb83e8ce9 Author: kevalbhatt <[email protected]> AuthorDate: Wed Sep 18 18:30:51 2019 +0530 ATLAS-3410 :UI - Term assigned to historical entity is not (dashboardv3) Signed-off-by: nixonrodrigues <[email protected]> (cherry picked from commit 43a5068429ae7da48f09ba1f124b4acbb53e3901) --- dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js | 6 +++--- dashboardv3/public/js/views/search/SearchResultLayoutView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js index 90c6169..682feb3 100644 --- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js +++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js @@ -427,9 +427,9 @@ define(['require', var that = this, termData = ""; _.each(data, function(val) { - if (val.relationshipStatus == "ACTIVE") { - termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + _.escape(val.displayText) + '>' + _.escape(val.displayText) + '</span><i class="fa fa-close" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>'; - } + // if (val.relationshipStatus == "ACTIVE") { + termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + _.escape(val.displayText) + '>' + _.escape(val.displayText) + '</span><i class="'+(val.relationshipStatus == "ACTIVE" ? 'fa fa-close': "") + '" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>'; + // } }); this.ui.termList.find("span.btn").remove(); this.ui.termList.prepend(termData); diff --git a/dashboardv3/public/js/views/search/SearchResultLayoutView.js b/dashboardv3/public/js/views/search/SearchResultLayoutView.js index 7b73fdd..dbd368b 100644 --- a/dashboardv3/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv3/public/js/views/search/SearchResultLayoutView.js @@ -688,7 +688,7 @@ define(['require', } if (obj.status && Enums.entityStateReadOnly[obj.status]) { nameHtml += '<button type="button" title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>'; - return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>'; + nameHtml = '<div class="readOnly readOnlyLink">' + nameHtml + '</div>'; } var getImageData = function(options) { var imagePath = options.imagePath,
