You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2019/06/10 10:56:15 UTC
[atlas] branch branch-0.8 updated: ATLAS-3272 : UI - IE - 10 not
able to render the UI
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-0.8 by this push:
new f53c86b ATLAS-3272 : UI - IE - 10 not able to render the UI
f53c86b is described below
commit f53c86b6c18969338eaadca60339825ab3ec95d4
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Mon Jun 10 15:18:11 2019 +0530
ATLAS-3272 : UI - IE - 10 not able to render the UI
---
dashboardv2/public/js/utils/CommonViewFunction.js | 63 +++++++++++-----------
.../js/views/tag/TagDetailTableLayoutView.js | 1 -
2 files changed, 31 insertions(+), 33 deletions(-)
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 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
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 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
});
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 @@ define(['require',
collection: this.tagTermCollection,
includeFilter: false,
includePagination: true,
- includePageSize: false,
includeFooterRecords: true,
includePageSize: true,
includeGotoPage: true,