Merge pull request #7039 from JamBalaya56562/fix/remove-restore-cancel-button

Remove redundant cancel button from restore progress

Duplicati/Server/webroot/ngax/scripts/directives/waitArea.js

@@ -3,16 +3,12 @@ backupApp.directive('waitArea', function() {
     restrict: 'E',
     scope: {
         taskid: '=taskid',
-        text: '=text',
-        allowCancel: '=allowCancel'
+        text: '=text'
     },
     templateUrl: 'templates/waitarea.html',
-    controller: function($scope, ServerStatus, AppService) {
+    controller: function($scope, ServerStatus) {
         $scope.ServerStatus = ServerStatus;
         $scope.serverstate = ServerStatus.watch($scope);
-        $scope.cancelTask = function() {
-            AppService.post('/task/' + $scope.taskid + '/stop');
-        };
     }
   }
 });

Duplicati/Server/webroot/ngax/templates/restore.html

@@ -149,7 +149,7 @@
         </div>
 
         <div ng-show="connecting == true &amp;&amp; taskid != null">
-            <wait-area taskid="taskid" text="ConnectionProgress" allow-cancel="true"></wait-area>
+            <wait-area taskid="taskid" text="ConnectionProgress"></wait-area>
         </div>
 
         <div ng-show="connecting == true &amp;&amp; taskid == null">

Duplicati/Server/webroot/ngax/templates/waitarea.html

@@ -15,8 +15,4 @@
         {{'Server is currently paused,' | translate}} <a style="cursor: pointer" ng-click="ServerStatus.resume()" translate>resume now</a>
     </div>
 
-    <div ng-show="allowCancel">
-        <a href class="button" ng-click="cancelTask()" translate>Cancel</a>
-    </div>
-
 </div>