From d8f8ab785c2f7e76632fc8207562e87e4e8da93d Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Thu, 15 Jun 2017 22:52:49 +0200
Subject: [PATCH] fix(service-details): fix the ability to sort tasks (#931)

---
 app/components/service/includes/tasks.html  | 16 ++++++++--------
 app/components/service/serviceController.js |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/components/service/includes/tasks.html b/app/components/service/includes/tasks.html
index 51d8fdf9f..f90df4270 100644
--- a/app/components/service/includes/tasks.html
+++ b/app/components/service/includes/tasks.html
@@ -18,28 +18,28 @@
         <tr>
         <th>Id</th>
         <th>
-          <a ui-sref="service" ng-click="order('Status')">
+          <a ng-click="order('Status.State')">
           Status
-          <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-          <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+          <span ng-show="sortType == 'Status.State' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+          <span ng-show="sortType == 'Status.State' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
           </a>
         </th>
         <th ng-if="service.Mode !== 'global'">
-          <a ui-sref="service" ng-click="order('Slot')">
+          <a ng-click="order('Slot')">
           Slot
           <span ng-show="sortType == 'Slot' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
           <span ng-show="sortType == 'Slot' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
           </a>
         </th>
         <th>
-          <a ui-sref="service" ng-click="order('Node')">
+          <a ng-click="order('NodeId')">
           Node
-          <span ng-show="sortType == 'Node' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-          <span ng-show="sortType == 'Node' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+          <span ng-show="sortType == 'NodeId' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+          <span ng-show="sortType == 'NodeId' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
           </a>
         </th>
         <th>
-          <a ui-sref="service" ng-click="order('Updated')">
+          <a ng-click="order('Updated')">
           Last update
           <span ng-show="sortType == 'Updated' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
           <span ng-show="sortType == 'Updated' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js
index 8cc6453e1..535c10d60 100644
--- a/app/components/service/serviceController.js
+++ b/app/components/service/serviceController.js
@@ -5,8 +5,8 @@ function ($q, $scope, $stateParams, $state, $location, $anchorScroll, ServiceSer
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('service_tasks');
   $scope.tasks = [];
-  $scope.sortType = 'Status';
-  $scope.sortReverse = false;
+  $scope.sortType = 'Updated';
+  $scope.sortReverse = true;
 
   $scope.lastVersion = 0;