Commit 887087d9 by kevalbhatt

ATLAS-3791:- New UI: In valid option are visible For _CLASSIFIED ,…

ATLAS-3791:- New UI: In valid option are visible For _CLASSIFIED , _NOT_CLASSIFIED, _ALL_CLASSIFICATION_TYPES
parent e29abf12
...@@ -201,6 +201,9 @@ define([ ...@@ -201,6 +201,9 @@ define([
if (options) { if (options) {
_.extend(this.options, options); _.extend(this.options, options);
this.showHideGlobalFilter(); this.showHideGlobalFilter();
if(!this.options.value){
this.ui.searchNode.val('').trigger('keyup');
}
if (this.RBusinessMetadataTreeRender.currentView) { if (this.RBusinessMetadataTreeRender.currentView) {
this.RBusinessMetadataTreeRender.currentView.manualRender(this.options); this.RBusinessMetadataTreeRender.currentView.manualRender(this.options);
} }
......
...@@ -254,9 +254,14 @@ define([ ...@@ -254,9 +254,14 @@ define([
popoverOptions: { popoverOptions: {
selector: '.classificationPopover', selector: '.classificationPopover',
content: function() { content: function() {
var type = $(this).data('detail'), var name = this.dataset.name || null,
liString = " <li><i class='fa fa-plus'></i><a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-classification</a></li><li><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit</a></li><li><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='onDelete'>Delete</a></li><li><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='onSelectedSearch'>Search</a></li>" searchString = "<li><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='onSelectedSearch'>Search</a></li>";
return "<ul>" + liString + "</ul>"; if (name && Enums.addOnClassification.includes(name)) {
return "<ul>" + searchString + "</ul>";
} else {
var liString = " <li><i class='fa fa-plus'></i><a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-classification</a></li><li><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit</a></li><li><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='onDelete'>Delete</a></li>";
return "<ul>" + liString + searchString + "</ul>";
}
} }
} }
}); });
...@@ -581,9 +586,10 @@ define([ ...@@ -581,9 +586,10 @@ define([
}, },
node_customize: { node_customize: {
default: function(el) { default: function(el) {
var aTag = $(el).find(">a.jstree-anchor"); var aTag = $(el).find(">a.jstree-anchor"),
aTag.append("<span class='tree-tooltip'>" + aTag.text() + "</span>"); nameText = aTag.text();
$(el).append('<div class="tools"><i class="fa fa-ellipsis-h classificationPopover" rel="popover"></i></div>'); aTag.append("<span class='tree-tooltip'>" + nameText + "</span>");
$(el).append('<div class="tools"><i class="fa fa-ellipsis-h classificationPopover" rel="popover" data-name=' + nameText + '></i></div>');
} }
}, },
core: { core: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment