Merge branch 'develop'

src/main/ui/static/analysis/settle_tasks.js

@@ -42,7 +42,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                         }
                     }
                     let finished = $scope.progress.finished_sequence;
-                    if ($scope.currentTasks) {
+                    if ($scope.currentTasks && finished) {
                         for (let finId of finished) {
                             $scope.currentTasks.filter(task => task.task_id === finId).forEach(v => {
                                 v.idle = false;
@@ -157,7 +157,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         }
     }]);
 
-    app.controller('settleTasksPriorityListManageCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
+    app.controller('settleTasksPriorityListManageCtrl', ['$scope', '$http', '$uibModal', 'commonDialog',
+        function ($scope, $http, $uibModal, commonDialog) {
             $scope.filters = {};
             $scope.input = {}
             $scope.loadPriorities = function () {
@@ -165,6 +166,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     $scope.clients = res.data;
                 })
             };
+            $scope.loadPriorities();
             $scope.addPriorityClient = function () {
                 if (!$scope.input.moniker) {
                     return;

src/main/ui/static/analysis/templates/settle_tasks_index.html

@@ -23,7 +23,7 @@
             <div class="box-body">
                 <button type="button" class="btn btn-primary" ng-click="redirectToSettleLogs()">Today Settlement Logs
                 </button>
-                <button type="button" class="btn btn-primary" ng-click="modifyPriorityList()">Priority List</button>
+                <a class="btn btn-primary" ui-sref=".priority_list">Priority List</a>
             </div>
         </div>
         <div class="box box-info">