Skip to content

A
atlas
Commit 1a971463 by kevalbhatt
Options

ATLAS-3805:- UI:Basic Search: System Attribute 'typeName' in classification…

ATLAS-3805:- UI:Basic Search: System Attribute 'typeName' in classification filter, should list classification Names in drop down (cherry picked from commit d6d6f90fd0dd25dd76c8cfef3d0238e24364fd0e)
parent d6ba8569
Showing with 6 additions and 4 deletions
dashboardv2/public/js/views/search/QueryBuilderView.js
...@@ -23,9 +23,10 @@ define(['require', ...@@ -23,9 +23,10 @@ define(['require',
'utils/Utils', 'utils/Utils',
'utils/CommonViewFunction', 'utils/CommonViewFunction',
'utils/Enums', 'utils/Enums',
'utils/Globals',
'query-builder', 'query-builder',
'daterangepicker' 'daterangepicker'
], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils, CommonViewFunction, Enums) { ], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils, CommonViewFunction, Enums, Globals) {
var QueryBuilderView = Backbone.Marionette.LayoutView.extend( var QueryBuilderView = Backbone.Marionette.LayoutView.extend(
/** @lends QueryBuilderView */ /** @lends QueryBuilderView */
...@@ -231,7 +232,7 @@ define(['require', ...@@ -231,7 +232,7 @@ define(['require',
if (isSystemAttr && attrObj.name === "__typeName") { if (isSystemAttr && attrObj.name === "__typeName") {
var entityType = []; var entityType = [];
that.typeHeaders.fullCollection.each(function(model) { that.typeHeaders.fullCollection.each(function(model) {
if (model.get('category') == 'ENTITY') { if ((that.type == true && model.get('category') == 'ENTITY') || (that.tag == true && model.get('category') == "CLASSIFICATION")) {
entityType.push({ entityType.push({
"id": model.get("name"), "id": model.get("name"),
"text": model.get("name") "text": model.get("name")
......
dashboardv3/public/js/views/search/QueryBuilderView.js
...@@ -23,9 +23,10 @@ define(['require', ...@@ -23,9 +23,10 @@ define(['require',
'utils/Utils', 'utils/Utils',
'utils/CommonViewFunction', 'utils/CommonViewFunction',
'utils/Enums', 'utils/Enums',
'utils/Globals',
'query-builder', 'query-builder',
'daterangepicker' 'daterangepicker'
], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils, CommonViewFunction, Enums) { ], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils, CommonViewFunction, Enums, Globals) {
var QueryBuilderView = Backbone.Marionette.LayoutView.extend( var QueryBuilderView = Backbone.Marionette.LayoutView.extend(
/** @lends QueryBuilderView */ /** @lends QueryBuilderView */
...@@ -231,7 +232,7 @@ define(['require', ...@@ -231,7 +232,7 @@ define(['require',
if (isSystemAttr && attrObj.name === "__typeName") { if (isSystemAttr && attrObj.name === "__typeName") {
var entityType = []; var entityType = [];
that.typeHeaders.fullCollection.each(function(model) { that.typeHeaders.fullCollection.each(function(model) {
if (model.get('category') == 'ENTITY') { if ((that.type == true && model.get('category') == 'ENTITY') || (that.tag == true && model.get('category') == "CLASSIFICATION")) {
entityType.push({ entityType.push({
"id": model.get("name"), "id": model.get("name"),
"text": model.get("name") "text": model.get("name")
......
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