diff --git a/src/translation/en.json b/src/translation/en.json index 7ceaf97c9..add3cf1d6 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -1527,7 +1527,8 @@ "title": "Update Volume {{ volume }}" }, "tooltipEdit": "Edit Volume", - "mountStatus": "Mount Status" + "mountStatus": "Mount Status", + "type": "Type" }, "storage": { "mounts": { diff --git a/src/views/volumes.html b/src/views/volumes.html index 492788274..28e55117b 100644 --- a/src/views/volumes.html +++ b/src/views/volumes.html @@ -29,7 +29,7 @@

-
+

{{ volumeConfigure.volume.hostPath }}

@@ -128,8 +128,9 @@ - {{ 'volumes.name' | tr }} - {{ 'volumes.hostPath' | tr }} + {{ 'volumes.name' | tr }} + {{ 'volumes.type' | tr }} + {{ 'volumes.hostPath' | tr }} {{ 'main.actions' | tr }} @@ -142,8 +143,12 @@ {{ volume.name }} + + {{ volume.mountType }} + - {{ volume.hostPath }} ({{ volume.mountType }}) + {{ volume.mountOptions.host || volume.mountOptions.diskPath || volume.hostPath }}{{ volume.mountOptions.remoteDir }} + {{ volume.hostPath }} diff --git a/src/views/volumes.js b/src/views/volumes.js index 7854fa8bc..b88319ed1 100644 --- a/src/views/volumes.js +++ b/src/views/volumes.js @@ -162,9 +162,16 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat }; } + var hostPath; + if ($scope.volumeConfigure.mountType === 'noop') { + hostPath = $scope.volumeConfigure.hostPath; // settable by user + } else { + hostPath = '/mnt/volumes/' + $scope.volumeConfigure.name; // hardcoded in UI for ease of use + } + var func; if ($scope.volumeConfigure.adding) { - func = Client.addVolume.bind(Client, $scope.volumeConfigure.name, $scope.volumeConfigure.hostPath, $scope.volumeConfigure.mountType, mountOptions); + func = Client.addVolume.bind(Client, $scope.volumeConfigure.name, hostPath, $scope.volumeConfigure.mountType, mountOptions); } else { func = Client.updateVolume.bind(Client, $scope.volumeConfigure.volume.id, $scope.volumeConfigure.mountType, mountOptions); }