From a84c2858319f181ff1befc9ac7e148c00d8b5b2b Mon Sep 17 00:00:00 2001 From: ThieryMichel Date: Fri, 10 Apr 2015 17:33:44 +0200 Subject: [PATCH 1/2] fix ordering when more than 10 fields --- src/javascripts/ng-admin/es6/lib/Field/Field.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/javascripts/ng-admin/es6/lib/Field/Field.js b/src/javascripts/ng-admin/es6/lib/Field/Field.js index 001af7d8..8ad74324 100644 --- a/src/javascripts/ng-admin/es6/lib/Field/Field.js +++ b/src/javascripts/ng-admin/es6/lib/Field/Field.js @@ -46,13 +46,15 @@ class Field { } order() { - if (arguments.length && arguments[1] !== true) { - console.warn('Setting order with Field.order is deprecated, order directly in fields array'); + if (arguments.length) { + if(arguments[1] !== true) { + console.warn('Setting order with Field.order is deprecated, order directly in fields array'); + } this._order = arguments[0]; return this; } - return this._order || 0; + return this._order; } isDetailLink(detailLink) { From 3b5909c075a532d80013f48476c0cd60904b062c Mon Sep 17 00:00:00 2001 From: ThieryMichel Date: Mon, 13 Apr 2015 16:40:06 +0200 Subject: [PATCH 2/2] add a test --- .../ng-admin/es6/tests/lib/View/ViewTest.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/javascripts/ng-admin/es6/tests/lib/View/ViewTest.js b/src/javascripts/ng-admin/es6/tests/lib/View/ViewTest.js index e95bad62..1c3e43d0 100644 --- a/src/javascripts/ng-admin/es6/tests/lib/View/ViewTest.js +++ b/src/javascripts/ng-admin/es6/tests/lib/View/ViewTest.js @@ -89,6 +89,20 @@ describe('View', function() { assert.deepEqual(view.fields(), [field1, field2]); }); + it('should keep the default order of the given array to equal to the index even when more than 10 fields', function() { + var view = new View(new Entity('post')); + var fields = Array.from(new Array(11).keys()).map(function (i) { + return new Field(i); + }); + view.fields(fields); + + assert.deepEqual(view.fields(), fields); + + fields.map(function (field, index) { + assert.equal(field.order(), index); + }); + }); + it('should add fields when called with a nested array argument', function() { var view = new View(new Entity('post')); var field1 = new Field('foo');