You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pi...@apache.org on 2022/02/17 04:56:06 UTC

[atlas] branch branch-2.0 updated: ATLAS-4513 : Delete Term option appears even though there is no term to delete.

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

pinal 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 906f12a  ATLAS-4513 : Delete Term option appears even though there is no term to delete.
906f12a is described below

commit 906f12ad3fef29c098a50d07d608dd93d2062af8
Author: Farhan Khan <fa...@freestoneinfotech.com>
AuthorDate: Mon Feb 14 19:53:35 2022 +0530

    ATLAS-4513 : Delete Term option appears even though there is no term to delete.
    
    Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
    (cherry picked from commit 05b27be8b8bccddc2c2d0c4d11dca2c97bd7ee8d)
---
 dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index 4aeb6c8..3363607 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -76,6 +76,8 @@ define(['require',
                         },
                         onModalClose: function() {
                             that.ui.createGlossary.removeAttr("disabled");
+                            that.ui.termTree.jstree(true).refresh();
+                            that.ui.categoryTree.jstree(true).refresh();
                         }
                     })
                 };
@@ -217,7 +219,7 @@ define(['require',
                 if (Utils.getUrlState.isGlossaryTab()) {
                     var obj = this.query[this.viewType],
                         $tree = this.ui[(this.viewType == "term" ? "termTree" : "categoryTree")];
-                    obj["gId"] = that.value.gId; //this Property added, Because when we toggle the GlossaryViewButton it does not adds the gId which is required for selection.  
+                    obj["gId"] = that.value ? that.value.gId : null; //this Property added, Because when we toggle the GlossaryViewButton it does not adds the gId which is required for selection.
                     if (obj.guid) {
                         var node = $tree.jstree(true).get_node(obj.guid);
                         if (node) {
@@ -769,6 +771,9 @@ define(['require',
                             });
                         },
                         complete: function() {
+                            if (that.glossaryCollection.fullCollection.length === 0) {
+                                that.guid = null;
+                            }
                             that.notificationModal.hideButtonLoader();
                             that.notificationModal.remove();
                         }