jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixes to backups view

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-05-15 12:48:54 -07:00
parent c38c440e63
commit c2ed909818
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/backups.html
+4 -4
View File
@@ -258,7 +258,7 @@
<td><div>{{ backup.dependsOn.length }} app(s)</div></td>
<td><div uib-tooltip="{{ backup.creationTime | prettyLongDate }}">{{ backup.creationTime | prettyDate }}</div></td>
<td class="text-right no-wrap" style="vertical-align: bottom">
<button class="btn btn-xs btn-default" ng-click="downloadConfig(backup)" uib-tooltip="Download Backup Configuration"><i class="far fa-file"></i></button>
<button class="btn btn-xs btn-default" ng-click="downloadConfig(backup)" uib-tooltip="Download Backup Configuration"><i class="fas fa-file-alt"></i></button>
</td>
</tr>
</tbody>
@@ -285,9 +285,9 @@
<div class="row">
<div class="col-md-12 text-right">
<button class="btn btn-default" ng-click="createBackup.startCleanup()" ng-show="!createBackup.busy" style="margin-right: 10px">Cleanup Backups</button>
<button class="btn btn-outline btn-primary" ng-click="createBackup.startBackup()" ng-show="!createBackup.busy" style="margin-right: 10px">Backup now</button>
<button class="btn btn-outline btn-danger" ng-click="createBackup.stopTask()" ng-show="createBackup.busy" style="margin-right: 10px">Stop {{ createBackup.taskType === 'backup' ? 'Backup' : 'Cleanup' }}</button>
<button class="btn btn-default" ng-click="createBackup.startCleanup()" ng-show="!createBackup.busy" style="margin-right: 5px">Cleanup Backups</button>
<button class="btn btn-outline btn-primary" ng-click="createBackup.startBackup()" ng-show="!createBackup.busy"">Backup now</button>
<button class="btn btn-outline btn-danger" ng-click="createBackup.stopTask()" ng-show="createBackup.busy"">Stop {{ createBackup.taskType === 'backup' ? 'Backup' : 'Cleanup' }}</button>
</div>
</div>
</div>
src/views/backups.js
+2 -1
View File
@@ -129,7 +129,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
message: '',
errorMessage: '',
taskId: '',
taskType: '',
taskType: 'backup',
checkStatus: function () {
Client.getLatestTaskByType($scope.createBackup.taskType, function (error, task) {
@@ -477,6 +477,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
if (error) return console.error(error);
$scope.backups = backups;
$scope.backups = $scope.backups.slice(0, 20); // only show 20 since we don't have pagination
if ($scope.backups.length > 0) {
$scope.lastBackup = backups[0];