You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2017/05/16 13:12:25 UTC
[1/2] incubator-atlas git commit: ATLAS-1759 : UI - Add checkbox to
exclude/include deleted entities in schema table.
Repository: incubator-atlas
Updated Branches:
refs/heads/0.8-incubating 08d2d26fd -> 034f29283
refs/heads/master d7a139e11 -> cf64a03e0
ATLAS-1759 : UI - Add checkbox to exclude/include deleted entities in schema table.
Signed-off-by: nixonrodrigues <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/cf64a03e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/cf64a03e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/cf64a03e
Branch: refs/heads/master
Commit: cf64a03e05c64ce25777bd478d4dda888f3e6a9c
Parents: d7a139e
Author: Kalyani <ka...@freestoneinfotech.com>
Authored: Tue May 16 15:18:51 2017 +0530
Committer: nixonrodrigues <ni...@apache.org>
Committed: Tue May 16 18:39:36 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/js/views/schema/SchemaLayoutView.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cf64a03e/dashboardv2/public/js/views/schema/SchemaLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/schema/SchemaLayoutView.js b/dashboardv2/public/js/views/schema/SchemaLayoutView.js
index 60c2a6b..d069c44 100644
--- a/dashboardv2/public/js/views/schema/SchemaLayoutView.js
+++ b/dashboardv2/public/js/views/schema/SchemaLayoutView.js
@@ -203,7 +203,7 @@ define(['require',
this.$('.fontLoader').hide();
this.$('.tableOverlay').hide();
},
- renderTableLayoutView: function(deleteEnity) {
+ renderTableLayoutView: function() {
var that = this;
require(['utils/TableLayout'], function(TableLayout) {
var columnCollection = Backgrid.Columns.extend({
@@ -227,7 +227,7 @@ define(['require',
// return this;
// }
});
- var columns = new columnCollection(that.getSchemaTableColumns(deleteEnity));
+ var columns = new columnCollection(that.getSchemaTableColumns());
//columns.setPositions().sort();
that.RSchemaTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
columns: columns
@@ -270,7 +270,7 @@ define(['require',
var value = model.get('attributes')[key];
if (key === "name" && model.get('guid')) {
var nameHtml = '<a href="#!/detailPage/' + model.get('guid') + '">' + value + '</a>';
- if (model.get('status') && Enums.entityStateReadOnly[model.get('status')] && deleteEnity) {
+ if (model.get('status') && Enums.entityStateReadOnly[model.get('status')]) {
nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else {
[2/2] incubator-atlas git commit: ATLAS-1759 : UI - Add checkbox to
exclude/include deleted entities in schema table.
Posted by ni...@apache.org.
ATLAS-1759 : UI - Add checkbox to exclude/include deleted entities in schema table.
Signed-off-by: nixonrodrigues <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/034f2928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/034f2928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/034f2928
Branch: refs/heads/0.8-incubating
Commit: 034f29283c45925df3e6f2516cacdefd86d1fc63
Parents: 08d2d26
Author: Kalyani <ka...@freestoneinfotech.com>
Authored: Tue May 16 15:18:51 2017 +0530
Committer: nixonrodrigues <ni...@apache.org>
Committed: Tue May 16 18:41:26 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/js/views/schema/SchemaLayoutView.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/034f2928/dashboardv2/public/js/views/schema/SchemaLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/schema/SchemaLayoutView.js b/dashboardv2/public/js/views/schema/SchemaLayoutView.js
index 60c2a6b..d069c44 100644
--- a/dashboardv2/public/js/views/schema/SchemaLayoutView.js
+++ b/dashboardv2/public/js/views/schema/SchemaLayoutView.js
@@ -203,7 +203,7 @@ define(['require',
this.$('.fontLoader').hide();
this.$('.tableOverlay').hide();
},
- renderTableLayoutView: function(deleteEnity) {
+ renderTableLayoutView: function() {
var that = this;
require(['utils/TableLayout'], function(TableLayout) {
var columnCollection = Backgrid.Columns.extend({
@@ -227,7 +227,7 @@ define(['require',
// return this;
// }
});
- var columns = new columnCollection(that.getSchemaTableColumns(deleteEnity));
+ var columns = new columnCollection(that.getSchemaTableColumns());
//columns.setPositions().sort();
that.RSchemaTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
columns: columns
@@ -270,7 +270,7 @@ define(['require',
var value = model.get('attributes')[key];
if (key === "name" && model.get('guid')) {
var nameHtml = '<a href="#!/detailPage/' + model.get('guid') + '">' + value + '</a>';
- if (model.get('status') && Enums.entityStateReadOnly[model.get('status')] && deleteEnity) {
+ if (model.get('status') && Enums.entityStateReadOnly[model.get('status')]) {
nameHtml += '<button type="button" title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else {