atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [09/50] [abbrv] incubator-atlas git commit: ATLAS-1099 : UI : multiple tag assign button hides wrongly
Date Fri, 23 Dec 2016 01:46:38 GMT
ATLAS-1099 : UI : multiple tag assign button hides wrongly

(cherry picked from commit 2ef0fc46d0e32c636da369911a1527e849f09049)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/cb28bb4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/cb28bb4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/cb28bb4f

Branch: refs/heads/0.7-incubating
Commit: cb28bb4fefb6f69d9e81a3440f7011166dd63ff6
Parents: 41ea3f5
Author: kalyanikk <kalyani.kashikar@freestoneinfotech.com>
Authored: Fri Aug 5 19:25:43 2016 +0530
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Thu Dec 22 14:51:04 2016 -0800

----------------------------------------------------------------------
 dashboardv2/public/css/scss/form.scss              |  9 ++++++---
 dashboardv2/public/css/scss/override.scss          |  4 ++++
 dashboardv2/public/css/scss/search.scss            |  4 ++++
 .../schema/SchemaTableLayoutView_tmpl.html         |  6 ++++--
 dashboardv2/public/js/utils/TableLayout.js         |  2 +-
 .../public/js/views/audit/AuditTableLayoutView.js  |  2 +-
 .../public/js/views/schema/SchemaLayoutView.js     | 17 +++++++++++------
 .../public/js/views/search/SearchLayoutView.js     |  3 +++
 .../js/views/search/SearchResultLayoutView.js      | 13 ++++++++-----
 release-log.txt                                    |  1 +
 10 files changed, 43 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/css/scss/form.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/form.scss b/dashboardv2/public/css/scss/form.scss
index 0cae6f6..e17b7bb 100644
--- a/dashboardv2/public/css/scss/form.scss
+++ b/dashboardv2/public/css/scss/form.scss
@@ -31,9 +31,12 @@
     }
 }
 
-.sidebar-wrapper .form-control {
-    background-color: $white;
-    border: 1px $white solid;
+.sidebar-wrapper {
+    z-index: 9 !important;
+    .form-control {
+        background-color: $white;
+        border: 1px $white solid;
+    }
 }
 
 .well {

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/css/scss/override.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/override.scss b/dashboardv2/public/css/scss/override.scss
index bbcc319..fc05f78 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -222,6 +222,10 @@
     cursor: pointer;
 }
 
+.popover {
+    z-index: 99;
+}
+
 .popover-content {
     ul {
         color: $dark_gray;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/css/scss/search.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/search.scss b/dashboardv2/public/css/scss/search.scss
index 959405e..dc38409 100644
--- a/dashboardv2/public/css/scss/search.scss
+++ b/dashboardv2/public/css/scss/search.scss
@@ -96,3 +96,7 @@ input {
 .labelShowRecord {
     line-height: 40px;
 }
+
+.btnAssign {
+    margin-bottom: 15px;
+}

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
index 7eb14b3..7422a97 100644
--- a/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<a href="javascript:void(0)" class="inputAssignTag multiSelectTerm" style="display:none"
data-id="addTerm"><i class="fa fa-folder-o"></i> Assign Term</a>
-<a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag" style="display:none"
data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
+<div class="clearfix">
+    <a href="javascript:void(0)" class="inputAssignTag multiSelectTerm btnAssign" style="display:none"
data-id="addTerm"><i class="fa fa-folder-o"></i> Assign Term</a>
+    <a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag btnAssign"
style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign
Tag</a>
+</div>
 <div id="r_tagLayoutView"></div>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/js/utils/TableLayout.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/TableLayout.js b/dashboardv2/public/js/utils/TableLayout.js
index 96251a2..fb1ad9f 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -310,7 +310,7 @@ define(['require',
                 var totalRecords = collState.totalRecords || 0;
                 var pageStartIndex = totalRecords ? (collState.currentPage * collState.pageSize)
: 0;
                 var pageEndIndex = pageStartIndex + this.collection.length;
-                this.$('[data-id="r_footerRecords"]').html('<h5>Showing ' + (totalRecords
? pageStartIndex + 1 : 1) + ' - ' + pageEndIndex + '</h5>');
+                this.$('[data-id="r_footerRecords"]').html('<h5>Showing ' + (totalRecords
? pageStartIndex + 1 : (this.collection.length === 0) ? 0 : 1) + ' - ' + pageEndIndex + '</h5>');
                 return this;
             },
             /**

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index 6d2f722..f9920f2 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -223,10 +223,10 @@ define(['require',
                     'modules/Modal',
                     'views/audit/CreateAuditTableLayoutView',
                 ], function(Modal, CreateAuditTableLayoutView) {
+                    that.action = $(e.target).data("action");
                     var eventModel = that.entityCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid')
}).toJSON(),
                         collectionModel = new that.entityCollection.model(eventModel),
                         view = new CreateAuditTableLayoutView({ guid: that.guid, entityModel:
collectionModel, action: that.action });
-                    that.action = $(e.target).data("action");
                     var modal = new Modal({
                         title: that.action,
                         content: view,

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/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 228ef7d..9bd8c82 100644
--- a/dashboardv2/public/js/views/schema/SchemaLayoutView.js
+++ b/dashboardv2/public/js/views/schema/SchemaLayoutView.js
@@ -112,14 +112,8 @@ define(['require',
                 this.listenTo(this.schemaCollection, 'backgrid:selected', function(model,
checked) {
                     if (checked === true) {
                         model.set("isEnable", true);
-                        if (Globals.taxonomy) {
-                            this.$('.multiSelectTerm').show();
-                        }
-                        this.$('.multiSelectTag').show();
                     } else {
                         model.set("isEnable", false);
-                        this.$('.multiSelectTerm').hide();
-                        this.$('.multiSelectTag').hide();
                     }
                     this.arr = [];
                     var that = this;
@@ -132,6 +126,17 @@ define(['require',
                             });
                         }
                     });
+                    if (this.arr.length > 0) {
+                        if (Globals.taxonomy) {
+                            this.$('.multiSelectTerm').show();
+                        }
+                        this.$('.multiSelectTag').show();
+                    } else {
+                        if (Globals.taxonomy) {
+                            this.$('.multiSelectTerm').hide();
+                        }
+                        this.$('.multiSelectTag').hide();
+                    }
                 });
                 this.listenTo(this.schemaCollection, "error", function(value) {
                     $('.schemaTable').hide();

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/js/views/search/SearchLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index fc30649..6469c62 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -202,6 +202,9 @@ define(['require',
                     this.$('.typeLOV').hide();
                     this.type = "fulltext";
                 }
+                if (this.query[this.type].query !== Utils.getUrlState.getQueryParams().query
&& this.type == Utils.getUrlState.getQueryParams().searchType) {
+                    this.query[this.type].query = Utils.getUrlState.getQueryParams().query;
+                }
                 Utils.setUrl({
                     url: '#!/search/searchResult',
                     urlParams: {

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/dashboardv2/public/js/views/search/SearchResultLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 4b3a8e1..865167d 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -141,16 +141,12 @@ define(['require',
             bindEvents: function() {
                 var that = this;
                 this.listenTo(this.searchCollection, 'backgrid:selected', function(model,
checked) {
+                    this.arr = [];
                     if (checked === true) {
                         model.set("isEnable", true);
-                        this.$('.searchResult').find(".inputAssignTag.multiSelect").show();
-                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").show();
                     } else {
                         model.set("isEnable", false);
-                        this.$('.searchResult').find(".inputAssignTag.multiSelect").hide();
-                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").hide();
                     }
-                    this.arr = [];
                     this.searchCollection.find(function(item) {
                         if (item.get('isEnable')) {
                             var term = [];
@@ -160,6 +156,13 @@ define(['require',
                             });
                         }
                     });
+                    if (this.arr.length > 0) {
+                        this.$('.searchResult').find(".inputAssignTag.multiSelect").show();
+                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").show();
+                    } else {
+                        this.$('.searchResult').find(".inputAssignTag.multiSelect").hide();
+                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").hide();
+                    }
                 });
                 this.listenTo(this.searchCollection, "error", function(value, responseData)
{
                     this.$('.fontLoader').hide();

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cb28bb4f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 07b6ca0..efd00c6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -28,6 +28,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file
(dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via
shwethags)
 
 ALL CHANGES:
+ATLAS-1099 UI : multiple tag assign button hides wrongly (Kalyanikashikar via sumasai)
 ATLAS-1087 Provide an option to turn off persisting entity definition in audits (sumasai,
shwethags)
 ATLAS-1097 Fix a potential NPE issue flagged by Coverity scan (mneethiraj via shwethags)
 ATLAS-1090 UI: Multi-Select Tagging. (Kalyanikashikar via kevalbhatt)


Mime
View raw message