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

Adjust webadmin to work with volume IDs

Browse Source
This commit is contained in:
Johannes Zellner
2014-03-17 08:14:11 -07:00
parent ae0441c7e1
commit cf8f91c5c5
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webadmin/js/controller/volumedelete.js
+5 -4
View File
@@ -3,12 +3,13 @@
function VolumeDeleteController ($scope, $routeParams, Client) {
console.debug('VolumeDeleteController');
if (!$routeParams.volume) {
if (!$routeParams.volume || !$routeParams.volumeName) {
console.error('No volume provided.');
return window.location.replace('#/maintabview');
}
$scope.volumeName = $routeParams.volume;
$scope.volumeId = $routeParams.volume;
$scope.volumeName = $routeParams.volumeName;
$scope.volume = {};
$scope.volume.name = '';
@@ -28,13 +29,13 @@ function VolumeDeleteController ($scope, $routeParams, Client) {
}
$scope.disabled = true;
Client.unmount($scope.volume.name, $scope.volume.password, function (error, result) {
Client.unmount($scope.volumeId, $scope.volume.password, function (error, result) {
if (error) {
console.warn('Error unmounting the volume', error);
// in this case we still try to delete the volume
}
Client.deleteVolume($scope.volume.name, $scope.volume.password, function (error, result) {
Client.deleteVolume($scope.volumeId, $scope.volume.password, function (error, result) {
if (error) {
if (error.statusCode === 403) {
$scope.error.password = 'Password is wrong';
webadmin/js/controller/volumelist.js
+3 -6
View File
@@ -24,18 +24,15 @@ function VolumeListController ($scope, $modal, Client) {
};
$scope.deleteVolume = function (volume) {
// TODO urlencode?
window.location.href = '#/volumedelete?volume=' + volume;
window.location.href = '#/volumedelete?volume=' + volume.id + '&volumeName=' + encodeURIComponent(volume.name);
};
$scope.mountVolume = function (volume) {
// TODO urlencode?
window.location.href = '#/volumemount?volume=' + volume;
window.location.href = '#/volumemount?volume=' + volume.id + '&volumeName=' + encodeURIComponent(volume.name);
};
$scope.unmountVolume = function (volume) {
// TODO urlencode?
window.location.href = '#/volumeunmount?volume=' + volume;
window.location.href = '#/volumeunmount?volume=' + volume.id + '&volumeName=' + encodeURIComponent(volume.name);
};
refresh();
webadmin/js/controller/volumemount.js
+4 -3
View File
@@ -3,13 +3,14 @@
function VolumeMountController ($scope, $routeParams, Client) {
console.debug('VolumeMountController');
if (!$routeParams.volume) {
if (!$routeParams.volume || !$routeParams.volumeName) {
console.error('No volume provided.');
return window.location.replace('#/maintabview');
}
$scope.volume = {};
$scope.volume.name = $routeParams.volume;
$scope.volume.id = $routeParams.volume;
$scope.volume.name = $routeParams.volumeName;
$scope.volume.password = '';
$scope.disabled = false;
$scope.error = {};
@@ -20,7 +21,7 @@ function VolumeMountController ($scope, $routeParams, Client) {
$scope.error.password = null;
$scope.disabled = true;
Client.mount($scope.volume.name, $scope.volume.password, function (error, result) {
Client.mount($scope.volume.id, $scope.volume.password, function (error, result) {
if (error) {
if (error.statusCode === 403) {
$scope.error.password = 'Password is wrong';
webadmin/js/controller/volumeunmount.js
+4 -3
View File
@@ -3,13 +3,14 @@
function VolumeUnmountController ($scope, $routeParams, Client) {
console.debug('VolumeUnmountController');
if (!$routeParams.volume) {
if (!$routeParams.volume || !$routeParams.volumeName) {
console.error('No volume provided.');
return window.location.replace('#/maintabview');
}
$scope.volume = {};
$scope.volume.name = $routeParams.volume;
$scope.volume.id = $routeParams.volume;
$scope.volume.name = $routeParams.volumeName;
$scope.volume.password = '';
$scope.disabled = false;
@@ -17,7 +18,7 @@ function VolumeUnmountController ($scope, $routeParams, Client) {
console.debug('Try to unmount volume %s.', $scope.volume.name);
$scope.disabled = true;
Client.unmount($scope.volume.name, $scope.volume.password, function (error, result) {
Client.unmount($scope.volume.id, $scope.volume.password, function (error, result) {
if (error) {
console.error('Unable to unmount volume.', error);
$scope.disabled = false;
webadmin/partials/volumelist.html
+3 -3
View File
@@ -20,8 +20,8 @@
The volume is <span ng-hide="volume.isMounted">not</span> mounted.
</div>
<div class="col-xs-3">
<button class="btn btn-sm btn-block pull-right" ng-click="mountVolume(volume.name)" ng-hide="volume.isMounted">Mount</span></button>
<button class="btn btn-sm btn-block pull-right" ng-click="unmountVolume(volume.name)" ng-show="volume.isMounted">Unmount</span></button>
<button class="btn btn-sm btn-block pull-right" ng-click="mountVolume(volume)" ng-hide="volume.isMounted">Mount</span></button>
<button class="btn btn-sm btn-block pull-right" ng-click="unmountVolume(volume)" ng-show="volume.isMounted">Unmount</span></button>
</div>
</div>
<div class="row">
@@ -29,7 +29,7 @@
Remove access to this volume
</div>
<div class="col-xs-3">
<button class="btn btn-sm btn-block pull-right" ng-click="deleteVolume(volume.name)"><span class="glyphicon glyphicon glyphicon-trash"></span></button>
<button class="btn btn-sm btn-block pull-right" ng-click="deleteVolume(volume)"><span class="glyphicon glyphicon glyphicon-trash"></span></button>
</div>
</div>
<form role="form" ng-submit="shareWithUser()">