[RFR] Fix exportfields config

src/javascripts/ng-admin/Crud/misc/EntryFormater.js

@@ -7,6 +7,7 @@ define(function () {
     }
 
     EntryFormatter.prototype.formatField = function formatField(field) {
+        var label = field.label() || filed.name();
         switch (field.type()) {
             case 'number':
             case 'text':
@@ -20,13 +21,13 @@ define(function () {
             case 'choices':
             case 'file':
             case 'template':
-                return { label: field.label(), name: field.name(), type: 'field' };
+                return { label: label, name: field.name(), type: 'field' };
             case 'reference':
-                return { label: field.label(), name: field.name(), type: 'reference' };
+                return { label: label, name: field.name(), type: 'reference' };
             case 'referenced_list':
                 return; //ignored
         }
-    }
+    };
 
     EntryFormatter.prototype.getFormatter = function getFormatter(fields) {
         var formattedFields = fields.map(this.formatField);

src/javascripts/ng-admin/es6/lib/Utils/fieldsUtils.js

@@ -0,0 +1,15 @@
+export default {
+    /**
+     * Convert fieldsLiteral as returned by fields methods to an array of field sorted by their order
+     */
+    fieldsLiteralToArray: function (fieldsLiteral) {
+        var array = Object.keys(fieldsLiteral).map(function (key) {
+            return fieldsLiteral[key];
+        })
+        .sort(function (a, b) {
+            return a.order() - b.order();
+        });
+
+        return array;
+    }
+};

src/javascripts/ng-admin/es6/lib/View/ListView.js

@@ -1,4 +1,5 @@
 import View from './View';
+import fieldsUtils from '../Utils/fieldsUtils';
 
 class ListView extends View {
     constructor(name) {
@@ -101,10 +102,11 @@ class ListView extends View {
 
     exportFields() {
         if (!arguments.length) {
-            return this._exportFields.length == 0 ? this._fields : this._exportFields;
+            return this._exportFields.length === 0 ? this._fields : this._exportFields;
         }
+        var fields = fieldsUtils.fieldsLiteralToArray(arguments[0]);
 
-        this._exportFields = arguments[0];
+        this._exportFields = fields;
 
         return this;
     }

src/javascripts/ng-admin/es6/tests/lib/Utils/fieldsUtilsTest.js

@@ -0,0 +1,44 @@
+var assert = require('chai').assert;
+
+import fieldsUtils from "../../../lib/Utils/fieldsUtils";
+import Field from "../../../lib/Field/Field";
+
+describe('fieldsUtils', function() {
+    describe('fieldsLiteralToArray', function() {
+
+        it('should convert fields in literal form to array', function() {
+            var a = new Field('a');
+            var b = new Field('b');
+            var c = new Field('c');
+            var fields = {
+                a: a,
+                b: b,
+                c: c
+            }
+
+            assert.deepEqual(fieldsUtils.fieldsLiteralToArray(fields), [a, b, c]);
+        });
+
+        it('should sort array using order if specified', function() {
+            var a = new Field('a').order(3);
+            var b = new Field('b').order(2);
+            var c = new Field('c').order(1);
+            var fields = {
+                a: a,
+                b: b,
+                c: c,
+            }
+
+            assert.deepEqual(fieldsUtils.fieldsLiteralToArray(fields), [c, b, a]);
+        });
+
+        it('should return an array if given an array', function() {
+            var a = new Field('a').order(3);
+            var b = new Field('b').order(2);
+            var c = new Field('c').order(1);
+            var fields = [a,b,c];
+
+            assert.deepEqual(fieldsUtils.fieldsLiteralToArray(fields), [c, b, a]);
+        });
+    });
+});