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

Fixup custom disk setup for volumes

Browse Source
This commit is contained in:
Johannes Zellner
2023-05-08 15:23:25 +02:00
parent e9d2a53aaf
commit 0626354844
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/views/volumes.html
+2 -2
View File
@@ -36,8 +36,8 @@
<div class="form-group" ng-show="volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs'">
<label class="control-label">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>
<select class="form-control" ng-model="volumeAdd.diskPath" ng-options="item.path as item.label for item in blockDevices track by item.path"></select>
<input type="text" class="form-control" style="margin-top: 5px;" ng-show="volumeAdd.diskPath.path === 'custom'" ng-model="volumeAdd.customDiskPath" ng-disabled="volumeAdd.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="(volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs') && volumeAdd.diskPath.path === 'custom'">
<select class="form-control" ng-model="volumeAdd.disk" ng-options="item as item.label for item in blockDevices track by item.path"></select>
<input type="text" class="form-control" style="margin-top: 5px;" ng-show="volumeAdd.disk.path === 'custom'" ng-model="volumeAdd.customDiskPath" ng-disabled="volumeAdd.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="(volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs') && volumeAdd.disk.path === 'custom'">
</div>
<div class="form-group" ng-show="volumeAdd.mountType === 'cifs' || volumeAdd.mountType === 'nfs' || volumeAdd.mountType === 'sshfs'">
dashboard/src/views/volumes.js
+5 -3
View File
@@ -105,7 +105,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
$scope.volumeAdd.remoteDir = '';
$scope.volumeAdd.username = '';
$scope.volumeAdd.password = '';
$scope.volumeAdd.diskPath = {};
$scope.volumeAdd.disk = {};
$scope.volumeAdd.customDiskPath = '';
$scope.volumeAdd.user = '';
$scope.volumeAdd.seal = false;
@@ -134,7 +134,9 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
result.push({ path: 'custom', label: 'Custom Path' });
$scope.blockDevices = result;
$scope.volumeAdd.diskPath = $scope.blockDevices[0];
$scope.volumeAdd.disk = $scope.blockDevices[0];
console.log('0-0-0', $scope.volumeAdd.disk, $scope.blockDevices)
$('#volumeAddModal').modal('show');
});
@@ -169,7 +171,7 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
};
} else if ($scope.volumeAdd.mountType === 'ext4' || $scope.volumeAdd.mountType === 'xfs') {
mountOptions = {
diskPath: $scope.volumeAdd.diskPath === 'custom' ? $scope.volumeAdd.customDiskPath : $scope.volumeAdd.diskPath
diskPath: $scope.volumeAdd.disk.path === 'custom' ? $scope.volumeAdd.customDiskPath : $scope.volumeAdd.disk.path
};
} else if ($scope.volumeAdd.mountType === 'mountpoint' || $scope.volumeAdd.mountType === 'filesystem') {
mountOptions = {