ATLAS-3272 : UI - IE - 10 not able to render the UI
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index 4511e1a..c74a8ee 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -629,11 +629,34 @@
urlObj = options.value,
formatDate = options.formatDate,
spliter = 1,
- apiObj = options.apiObj; //if apiObj then create object for API call else for QueryBuilder.
- if (urlObj && urlObj.length) {
- attrObj = createObject(urlObj);
-
- function createObject(urlObj) {
+ apiObj = options.apiObj,
+ mapUiOperatorToAPI = function(oper) {
+ if (oper == "=") {
+ return "eq";
+ } else if (oper == "!=") {
+ return "neq";
+ } else if (oper == "<") {
+ return "lt";
+ } else if (oper == "<=") {
+ return "lte";
+ } else if (oper == ">") {
+ return "gt";
+ } else if (oper == ">=") {
+ return "gte";
+ } else if (oper == "begins_with") {
+ return "startsWith";
+ } else if (oper == "ends_with") {
+ return "endsWith";
+ } else if (oper == "contains") {
+ return "contains";
+ } else if (oper == "not_null") {
+ return "notNull";
+ } else if (oper == "is_null") {
+ return "isNull";
+ }
+ return oper;
+ },
+ createObject = function(urlObj) {
var finalObj = {};
finalObj['condition'] = /^AND\(/.test(urlObj) ? "AND" : "OR";
urlObj = finalObj.condition === "AND" ? urlObj.substr(4).slice(0, -1) : urlObj.substr(3).slice(0, -1);
@@ -663,37 +686,13 @@
});
return finalObj;
}
+ //if apiObj then create object for API call else for QueryBuilder.
+ if (urlObj && urlObj.length) {
+ attrObj = createObject(urlObj);
} else {
return null;
}
return attrObj;
-
- function mapUiOperatorToAPI(oper) {
- if (oper == "=") {
- return "eq";
- } else if (oper == "!=") {
- return "neq";
- } else if (oper == "<") {
- return "lt";
- } else if (oper == "<=") {
- return "lte";
- } else if (oper == ">") {
- return "gt";
- } else if (oper == ">=") {
- return "gte";
- } else if (oper == "begins_with") {
- return "startsWith";
- } else if (oper == "ends_with") {
- return "endsWith";
- } else if (oper == "contains") {
- return "contains";
- } else if (oper == "not_null") {
- return "notNull";
- } else if (oper == "is_null") {
- return "isNull";
- }
- return oper;
- }
},
generateAPIObj: function(url) {
if (url && url.length) {
diff --git a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
index d934b76..8c0ddc9 100644
--- a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
@@ -87,7 +87,6 @@
collection: this.tagTermCollection,
includeFilter: false,
includePagination: true,
- includePageSize: false,
includeFooterRecords: true,
includePageSize: true,
includeGotoPage: true,
