Commit cc629d70 by Abhishek Kadam Committed by Sarath Subramanian

ATLAS-2778: UI: Enhance advanced search (DSL) by adding _CLASSIFIED and…

ATLAS-2778: UI: Enhance advanced search (DSL) by adding _CLASSIFIED and _NOT_CLASSIFIED keyword in classification search Signed-off-by: 's avatarSarath Subramanian <ssubramanian@hortonworks.com>
parent 9d4678e4
......@@ -134,5 +134,6 @@ define(['require'], function(require) {
validValues: getTermRelationAttributes(),
validValuesFor: getTermRelationAttributes()
}
Enums.addOnClassification = ["_CLASSIFIED", "_NOT_CLASSIFIED"]
return Enums;
});
\ No newline at end of file
......@@ -22,9 +22,10 @@ define(['require',
'utils/Utils',
'utils/UrlLinks',
'utils/Globals',
'utils/Enums',
'collection/VSearchList',
'utils/CommonViewFunction'
], function(require, Backbone, SearchLayoutViewTmpl, Utils, UrlLinks, Globals, VSearchList, CommonViewFunction) {
], function(require, Backbone, SearchLayoutViewTmpl, Utils, UrlLinks, Globals, Enums, VSearchList, CommonViewFunction) {
'use strict';
var SearchLayoutView = Backbone.Marionette.LayoutView.extend(
......@@ -228,7 +229,7 @@ define(['require',
}
}
var tagCheck = function(filterObj, type) {
if (that.value.tag) {
if (that.value.tag && !_.contains(Enums.addOnClassification, that.value.tag)) {
that.ui.tagAttrFilter.prop('disabled', false);
if (filterObj && filterObj.length) {
that.ui.tagAttrFilter.addClass('active');
......@@ -450,6 +451,10 @@ define(['require',
tagStr += '<option>' + (name) + '</option>';
}
});
//to insert extra classification list
_.each(Enums.addOnClassification, function(classificationName) {
tagStr += '<option>' + classificationName + '</option>';
});
that.ui.typeLov.html(typeStr);
that.ui.tagLov.html(tagStr);
this.ui.typeLov.select2({
......
......@@ -19,11 +19,10 @@ define(['require',
'backbone',
'hbs!tmpl/tag/AddTimezoneView_tmpl',
'moment',
'utils/Enums',
'utils/Globals',
'moment-timezone',
'daterangepicker'
], function(require, Backbone, AddTimezoneViewTmpl, moment, Enums, Globals) {
], function(require, Backbone, AddTimezoneViewTmpl, moment, Globals) {
'use strict';
return Backbone.Marionette.ItemView.extend(
......
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