Merge branch '372_disable_sort' of https://github.com/RichardBradley/…

…ng-admin into RichardBradley-372_disable_sort

doc/API-mapping.md

@@ -205,6 +205,8 @@ myApp.config(['RestangularProvider', function(RestangularProvider) {
 }]);
 ```
 
+(If a column is not sortable by your backend, e.g. a computed column, you can disable sorting per-column using [`Field.sortable(false)`](reference/Field.md#general-field-settings).)
+
 ## Filtering
 
 All filter fields are added as a serialized object passed as the value of the `_filters` query parameter. For instance, the following `filterView()` configuration:

doc/reference/Field.md

@@ -53,7 +53,11 @@ Create a new field of the given type. Default type is 'string', so you can omit
 Define the label of the field. Defaults to the uppercased field name.
 
 * `editable(boolean)`
-Define if the field is editable in the edition form. Usefult to display a field without allowing edition (e.g for creation date).
+Define if the field is editable in the edition form. Useful to display a field without allowing edition (e.g for creation date).
+
+* `sortable(boolean)`
+Define if the field is sortable in the list view (default `true`).
+(See ["Sort Columns and Sort Order"](../API-mapping.md#sort-columns-and-sort-order) for a discussion of how to integrate `ng-admin` sorting with your REST backend.)
 
 * `order(number|null)`
 Define the position of the field in the view.

package.json

@@ -14,8 +14,8 @@
     "lib/"
   ],
   "dependencies": {
+    "admin-config": "~0.12.1",
     "angular": "~1.4.8",
-    "admin-config": "0.12.1",
     "angular-numeraljs": "^1.1.6",
     "angular-sanitize": "^1.3.15",
     "angular-translate": "^2.11.0",

src/javascripts/ng-admin/Crud/list/maDatagrid.js

@@ -26,10 +26,13 @@ export default function maDatagrid() {
                 <ma-datagrid-multi-selector toggle-select-all="toggleSelectAll()" selection="selection" entries="entries"/>
             </th>
             <th ng-repeat="field in fields() track by $index" ng-class="field.getCssClasses()" class="ng-admin-column-{{ ::field.name() }} ng-admin-type-{{ ::field.type() }}">
-                <a ng-click="datagrid.sortCallback(field)">
+                <a ng-if="field.sortable()" ng-click="datagrid.sortCallback(field)">
                     <span class="glyphicon {{ sortDir() === 'DESC' ? 'glyphicon-chevron-up': 'glyphicon-chevron-down' }}" ng-if="datagrid.isSorting(field)"></span>
                     {{ field.label() | translate }}
                 </a>
+                <span ng-if="!field.sortable()">
+                    {{ field.label() | translate }}
+                </span>
             </th>
             <th ng-if="datagrid.shouldDisplayActions" class="ng-admin-column-actions" translate="ACTIONS"></th>
         </tr>