You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/12/23 20:29:21 UTC
ambari git commit: AMBARI-8895. Ascending - Descending sortings work
conversely on Alerts page. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 781deba16 -> 895b1adc0
AMBARI-8895. Ascending - Descending sortings work conversely on Alerts page. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/895b1adc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/895b1adc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/895b1adc
Branch: refs/heads/trunk
Commit: 895b1adc0dd284cb6a81b959042b1960a3070693
Parents: 781deba
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Dec 23 21:01:21 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Dec 23 21:28:47 2014 +0200
----------------------------------------------------------------------
ambari-web/app/views/common/sort_view.js | 18 +++++++-------
ambari-web/test/views/common/sort_view_test.js | 26 ++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/895b1adc/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 4cd8315..b311b0b 100644
--- a/ambari-web/app/views/common/sort_view.js
+++ b/ambari-web/app/views/common/sort_view.js
@@ -141,9 +141,9 @@ var wrapperView = Em.View.extend({
var a = misc.ipToInt(a.get(property.get('name')));
var b = misc.ipToInt(b.get(property.get('name')));
if (order) {
- return b - a;
- } else {
return a - b;
+ } else {
+ return b - a;
}
};
break;
@@ -154,9 +154,9 @@ var wrapperView = Em.View.extend({
a_p = Em.isNone(a_p) ? -Infinity : parseFloat(a_p);
b_p = Em.isNone(b_p) ? -Infinity : parseFloat(b_p);
if (order) {
- return b_p - a_p;
+ return a_p - b_p;;
} else {
- return a_p - b_p;
+ return b_p - a_p
}
};
break;
@@ -164,9 +164,9 @@ var wrapperView = Em.View.extend({
func = function (a, b) {
var res = stringUtils.compareVersions(a.get(property.get('name')), b.get(property.get('name')));
if (order) {
- return res;
- } else {
return -res;
+ } else {
+ return res;
}
};
break;
@@ -185,10 +185,10 @@ var wrapperView = Em.View.extend({
}
}
if (order) {
- return ret;
+ return -ret;
}
else {
- return -ret;
+ return ret;
}
};
break;
@@ -198,7 +198,7 @@ var wrapperView = Em.View.extend({
var b_p = b.get(property.get('name'));
a_p = Em.isNone(a_p) ? '' : '' + a_p;
b_p = Em.isNone(b_p) ? '' : '' + b_p;
- return order ? a_p.localeCompare(b_p) : b_p.localeCompare(a_p)
+ return order ? b_p.localeCompare(a_p) : a_p.localeCompare(b_p);
};
}
return func;
http://git-wip-us.apache.org/repos/asf/ambari/blob/895b1adc/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 f03fb52..aa7739a 100644
--- a/ambari-web/test/views/common/sort_view_test.js
+++ b/ambari-web/test/views/common/sort_view_test.js
@@ -34,25 +34,25 @@ describe('#wrapperView', function () {
a: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 1}}),
b: App.AlertDefinition.createRecord({summary: {WARNING: 1}}),
order: true,
- e: -1
+ e: 1
},
{
a: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 2}}),
b: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 1}}),
order: true,
- e: -1
+ e: 1
},
{
a: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 1}}),
b: App.AlertDefinition.createRecord({summary: {WARNING: 1}}),
order: false,
- e: 1
+ e: -1
},
{
a: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 2}}),
b: App.AlertDefinition.createRecord({summary: {OK: 1, WARNING: 1}}),
order: false,
- e: 1
+ e: -1
}
]).forEach(function(test, i) {
it('test #' + (i + 1), function () {
@@ -72,25 +72,25 @@ describe('#wrapperView', function () {
a: Em.Object.create({lastTriggered: 1}),
b: Em.Object.create({lastTriggered: 0}),
order: true,
- e: -1
+ e: 1
},
{
a: Em.Object.create({lastTriggered: 1}),
b: Em.Object.create({lastTriggered: 0}),
order: false,
- e: 1
+ e: -1
},
{
a: Em.Object.create({lastTriggered: null}),
b: Em.Object.create({lastTriggered: 1}),
order: true,
- e: Infinity
+ e: -Infinity
},
{
a: Em.Object.create({lastTriggered: null}),
b: Em.Object.create({lastTriggered: 1}),
order: false,
- e: -Infinity
+ e: Infinity
}
]).forEach(function (test, i) {
it('test #' + (i + 1), function () {
@@ -110,13 +110,13 @@ describe('#wrapperView', function () {
a: Em.Object.create({serviceName: 's1'}),
b: Em.Object.create({serviceName: 's2'}),
order: true,
- e: -1
+ e: 1
},
{
a: Em.Object.create({serviceName: 's1'}),
b: Em.Object.create({serviceName: 's2'}),
order: false,
- e: 1
+ e: -1
},
{
a: Em.Object.create({serviceName: 's1'}),
@@ -128,13 +128,13 @@ describe('#wrapperView', function () {
a: Em.Object.create({serviceName: null}),
b: Em.Object.create({serviceName: 's2'}),
order: true,
- e: -1
+ e: 1
},
{
a: Em.Object.create({serviceName: null}),
b: Em.Object.create({serviceName: 's2'}),
order: false,
- e: 1
+ e: -1
}
]).forEach(function (test, i) {
it('test #' + (i + 1), function () {
@@ -148,7 +148,7 @@ describe('#wrapperView', function () {
var func = sort.wrapperView.create().getSortFunc(property, true),
a = Em.Object.create({enabled: false}),
b = Em.Object.create({enabled: true});
- expect(func(a, b)).to.equal(-1);
+ expect(func(a, b)).to.equal(1);
});
});