Repository: ambari Updated Branches: refs/heads/trunk 281307fce -> a7f0c09bd
AMBARI-15840. Sorting Alerts with ALERT NAMES in Alerts UI is not working as expected (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7f0c09b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7f0c09b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7f0c09b Branch: refs/heads/trunk Commit: a7f0c09bdedeea61965bc4a7629fc599de2c71b8 Parents: 9f803fe Author: Alex Antonenko <[email protected]> Authored: Tue Apr 12 18:44:03 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Wed Apr 13 15:48:35 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/views/common/sort_view.js | 6 +++--- ambari-web/test/views/common/sort_view_test.js | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a7f0c09b/ambari-web/app/views/common/sort_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/sort_view.js b/ambari-web/app/views/common/sort_view.js index 011ddfc..bbb6004 100644 --- a/ambari-web/app/views/common/sort_view.js +++ b/ambari-web/app/views/common/sort_view.js @@ -177,8 +177,8 @@ var wrapperView = Em.View.extend({ func = function (a, b) { var a_p = a.get(property.get('name')); var b_p = b.get(property.get('name')); - a_p = Em.isNone(a_p) ? '' : '' + a_p; - b_p = Em.isNone(b_p) ? '' : '' + b_p; + a_p = Em.isNone(a_p) ? '' : ('' + a_p).toLowerCase(); + b_p = Em.isNone(b_p) ? '' : ('' + b_p).toLowerCase(); return order ? b_p.localeCompare(a_p) : a_p.localeCompare(b_p); }; } @@ -239,7 +239,7 @@ var serverWrapperView = Em.View.extend({ var childViews = this.get('childViews'); var statuses = App.db.getSortingStatuses(this.get('controller.name')); if (statuses) { - var sortingColumn = App.db.getSortingStatuses(this.get('controller.name')).find(function(column){ return column.status != 'sorting'}) + var sortingColumn = App.db.getSortingStatuses(this.get('controller.name')).find(function(column){ return column.status != 'sorting'}); if (sortingColumn) { var sortingColumnView = childViews.findProperty('name', sortingColumn.name); sortingColumnView.set('status', sortingColumn.status); http://git-wip-us.apache.org/repos/asf/ambari/blob/a7f0c09b/ambari-web/test/views/common/sort_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/sort_view_test.js b/ambari-web/test/views/common/sort_view_test.js index 1820250..a21a352 100644 --- a/ambari-web/test/views/common/sort_view_test.js +++ b/ambari-web/test/views/common/sort_view_test.js @@ -96,6 +96,18 @@ describe('#wrapperView', function () { b: Em.Object.create({serviceName: 's2'}), order: false, e: -1 + }, + { + a: Em.Object.create({serviceName: 's1'}), + b: Em.Object.create({serviceName: 'S2'}), + order: true, + e: 1 + }, + { + a: Em.Object.create({serviceName: 's1'}), + b: Em.Object.create({serviceName: 'S2'}), + order: false, + e: -1 } ]).forEach(function (test, i) { it('test #' + (i + 1), function () {
