You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/05/21 14:41:07 UTC
[1/2] atlas git commit: ATLAS-2707: Audit detail table is not able to
render object type
Repository: atlas
Updated Branches:
refs/heads/branch-1.0 8d8b81c30 -> 4d4bd5564
ATLAS-2707: Audit detail table is not able to render object type
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit 65338c4ded5fbfe43e7e645b62010b8c4218b8f6)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/4d4bd556
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/4d4bd556
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/4d4bd556
Branch: refs/heads/branch-1.0
Commit: 4d4bd556473dd67e4f1162a2433385978091b253
Parents: 4427f73
Author: kevalbhatt <kb...@apache.org>
Authored: Mon May 21 17:11:18 2018 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon May 21 07:40:13 2018 -0700
----------------------------------------------------------------------
dashboardv2/public/js/utils/CommonViewFunction.js | 6 +++++-
.../public/js/views/audit/CreateAuditTableLayoutView.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/4d4bd556/dashboardv2/public/js/utils/CommonViewFunction.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index bcff5e4..171f662 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -221,6 +221,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
val = '<a title="' + key + '" href="#!/detailPage/' + keyValue + '">' + keyValue + '</a>';
} else if (key.toLocaleLowerCase().indexOf("time") !== -1 || key.toLocaleLowerCase().indexOf("date") !== -1) {
val = new Date(keyValue);
+
+ if (isNaN(val.getTime())) {
+ val = _.escape(keyValue);
+ }
} else {
val = _.escape(keyValue);
}
@@ -824,4 +828,4 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
return CommonViewFunction;
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/atlas/blob/4d4bd556/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index 5670b8c..02b4c6f 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -83,7 +83,7 @@ define(['require',
this.ui.name.text(name);
if (parseDetailsObject) {
this.ui.auditHeaderValue.html('<th>Key</th><th>New Value</th>');
- table = CommonViewFunction.propertyTable({ scope: this, valueObject: parseDetailsObject, attributeDefs: this.attributeDefs, extractJSON: { extractKey: 'value' } });
+ table = CommonViewFunction.propertyTable({ scope: this, valueObject: parseDetailsObject, attributeDefs: this.attributeDefs });
if (table.length) {
this.ui.noData.hide();
this.ui.tableAudit.show();
[2/2] atlas git commit: ATLAS-2706: UI : Change the labels of
propagation classification popup
Posted by ma...@apache.org.
ATLAS-2706: UI : Change the labels of propagation classification popup
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit 026595501fc3de37f3993d4bb9c0e52f0f23c8d9)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/4427f73e
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/4427f73e
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/4427f73e
Branch: refs/heads/branch-1.0
Commit: 4427f73ef02dcb5fec9040553c2d2d3d45a4332d
Parents: 8d8b81c
Author: kevalbhatt <kb...@apache.org>
Authored: Mon May 21 12:43:29 2018 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon May 21 07:40:13 2018 -0700
----------------------------------------------------------------------
.../templates/graph/PropagationPropertyModalView_tmpl.html | 4 ++--
.../public/js/views/graph/PropagationPropertyModal.js | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/4427f73e/dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html b/dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html
index 6aae481..7dc4850 100644
--- a/dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html
@@ -18,12 +18,12 @@
<div class="col-sm-12">
<div class="row">
<div class="col-sm-9" style="margin-top: 5px;">
- <span class="pull-left">Propagation flow</span>
+ <span class="pull-left">Enable/Disable Propagation</span>
<label class="switch pull-left">
<input type="checkbox" class="switch-input" name="editPropagationType" value="text">
<span class="switch-slider"></span>
</label>
- <span class="pull-left">Block propagation</span>
+ <span class="pull-left">Select Classifications to Block Propagation</span>
</div>
</div>
<hr style="margin-top: 0px;">
http://git-wip-us.apache.org/repos/asf/atlas/blob/4427f73e/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
index 5972ea8..9aef264 100644
--- a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
+++ b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
@@ -124,7 +124,7 @@ define(['require',
this.viewType = 'flow';
var that = this,
modalObj = {
- title: 'Edit Propagation Flow',
+ title: 'Enable/Disable Propagation',
content: this,
okText: 'Update',
okCloses: false,
@@ -301,7 +301,7 @@ define(['require',
propagationStringValue += getTableRow({ "val": val, fromBlockClassification: false });
});
- classificationTableValue = "<table class='attriTable'><caption>Block Propagatation Table</caption><tr><th class='w30'>Classification</th><th>Entity Name</th><th class='w30'>Block Propagatation</th>" + propagationStringValue + "</table>";
+ classificationTableValue = "<table class='attriTable'><tr><th class='w30'>Classification</th><th>Entity Name</th><th class='w30'>Block Propagatation</th>" + propagationStringValue + "</table>";
this.ui.PropagatedClassificationTable.append(_.isEmpty(propagationStringValue) ? "No Records Found." : classificationTableValue);
},
@@ -333,12 +333,12 @@ define(['require',
showEditPropagation: function() {
this.$('.editPropagation').show();
this.$('.propagatedClassificationTable').hide();
- this.modal.$el.find('.modal-title').text("Edit Propagation Flow");
+ this.modal.$el.find('.modal-title').text("Enable/Disable Propagation");
},
showPropagatedClassificationTable: function() {
this.$('.editPropagation').hide();
this.$('.propagatedClassificationTable').show();
- this.modal.$el.find('.modal-title').text("Block Propagation Table");
+ this.modal.$el.find('.modal-title').text("Select Classifications to Block Propagation");
}
});