atlas git commit: ATLAS-2767: UI : "Create" button is not enabled after an error while createing a classification
Repository: atlas
Updated Branches:
refs/heads/branch-1.0 877cb55bf -> 3d69ad2f4
ATLAS-2767: UI : "Create" button is not enabled after an error while createing
a classification
Signed-off-by: Madhan Neethiraj
(cherry picked from commit 74dc605d453697c3830a726498eff3232dbba60f)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/3d69ad2f
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/3d69ad2f
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/3d69ad2f
Branch: refs/heads/branch-1.0
Commit: 3d69ad2f49a16a9748752019d077bb66be8c968f
Parents: 877cb55
Author: Abhishek Kadam
Authored: Fri Jun 29 11:48:33 2018 +0530
Committer: Madhan Neethiraj
Committed: Mon Jul 2 15:39:43 2018 -0700
--
dashboardv2/public/js/views/tag/TagAttributeItemView.js | 4
dashboardv2/public/js/views/tag/TagLayoutView.js| 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/3d69ad2f/dashboardv2/public/js/views/tag/TagAttributeItemView.js
--
diff --git a/dashboardv2/public/js/views/tag/TagAttributeItemView.js
b/dashboardv2/public/js/views/tag/TagAttributeItemView.js
index 3ce40e2..39ea292 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeItemView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeItemView.js
@@ -65,9 +65,13 @@ define(['require',
});
},
onCloseButton: function() {
+var tagName =
this.parentView.$el.find('[data-id="tagName"]').val();
if (this.parentView.collection.models.length > 0) {
this.model.destroy();
}
+if (this.parentView.collection.models.length == 0 && tagName
!= "") {
+
this.parentView.$el.parent().next().find('button.ok').removeAttr("disabled");
+}
}
});
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/3d69ad2f/dashboardv2/public/js/views/tag/TagLayoutView.js
--
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index c7a5edb..7381e64 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -209,7 +209,7 @@ define(['require',
var tagParents = '',
tagLists = '';
-if (this.collection && this.collection.fullCollection.length) {
+if (this.collection && this.collection.fullCollection.length
>= 0) {
var sortedCollection = this.collection.fullCollection;
this.tagTreeList = this.getTagTreeList({ collection:
sortedCollection });
if (searchString) {
atlas git commit: ATLAS-2767: UI : "Create" button is not enabled after an error while createing a classification
Repository: atlas
Updated Branches:
refs/heads/master 25bae4fe3 -> 74dc605d4
ATLAS-2767: UI : "Create" button is not enabled after an error while createing
a classification
Signed-off-by: Madhan Neethiraj
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/74dc605d
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/74dc605d
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/74dc605d
Branch: refs/heads/master
Commit: 74dc605d453697c3830a726498eff3232dbba60f
Parents: 25bae4f
Author: Abhishek Kadam
Authored: Fri Jun 29 11:48:33 2018 +0530
Committer: Madhan Neethiraj
Committed: Mon Jul 2 15:36:09 2018 -0700
--
dashboardv2/public/js/views/tag/TagAttributeItemView.js | 4
dashboardv2/public/js/views/tag/TagLayoutView.js| 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/74dc605d/dashboardv2/public/js/views/tag/TagAttributeItemView.js
--
diff --git a/dashboardv2/public/js/views/tag/TagAttributeItemView.js
b/dashboardv2/public/js/views/tag/TagAttributeItemView.js
index 3ce40e2..39ea292 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeItemView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeItemView.js
@@ -65,9 +65,13 @@ define(['require',
});
},
onCloseButton: function() {
+var tagName =
this.parentView.$el.find('[data-id="tagName"]').val();
if (this.parentView.collection.models.length > 0) {
this.model.destroy();
}
+if (this.parentView.collection.models.length == 0 && tagName
!= "") {
+
this.parentView.$el.parent().next().find('button.ok').removeAttr("disabled");
+}
}
});
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/74dc605d/dashboardv2/public/js/views/tag/TagLayoutView.js
--
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index c7a5edb..7381e64 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -209,7 +209,7 @@ define(['require',
var tagParents = '',
tagLists = '';
-if (this.collection && this.collection.fullCollection.length) {
+if (this.collection && this.collection.fullCollection.length
>= 0) {
var sortedCollection = this.collection.fullCollection;
this.tagTreeList = this.getTagTreeList({ collection:
sortedCollection });
if (searchString) {
