[atlas] branch branch-2.0 updated: ATLAS-3410 : UI - Term assigned to historical entity is not visible in Details page.

[nixon]

This is an automated email from the ASF dual-hosted git repository.

nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new c1cc01e  ATLAS-3410 : UI - Term assigned to historical entity is not 
visible in Details page.
c1cc01e is described below

commit c1cc01e720689cff72aa3d2a312aecb76085c038
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Wed Sep 18 12:22:56 2019 +0530

    ATLAS-3410 : UI - Term assigned to historical entity is not visible in 
Details page.
    
    Signed-off-by: nixonrodrigues <ni...@apache.org>
    (cherry picked from commit 71d9c6f35a69a0b3752ce5ca04edb588ec3d319e)
---
 dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js | 6 +++---
 dashboardv2/public/js/views/search/SearchResultLayoutView.js    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js 
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index d41c7c9..5fe5a9e 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -418,9 +418,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" title=' + _.escape(val.displayText) + ' 
data-id="termClick"><span>' + _.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/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 4c04492..021869b 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -475,7 +475,7 @@ define(['require',
                         that.ui.activePage.attr('title', "Page " + 
that.activePage);
                         that.ui.activePage.text(that.activePage);
                         that.renderTableLayoutView();
-                        if(dataLength>0){
+                        if (dataLength > 0) {
                             that.$('.searchTable').removeClass('noData')
                         }
                         if (Utils.getUrlState.isSearchTab() && value && 
!value.profileDBView) {
@@ -676,7 +676,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>';
                             }
                             return nameHtml;
                         }