Commit 6aa143c6 authored by Sascha Pfeiffer's avatar Sascha Pfeiffer

some more progress

Signed-off-by: default avatarSascha Pfeiffer <sascha.pfeiffer@psono.com>
parent d55737af
......@@ -178,12 +178,14 @@ var build = function(build_path, type) {
"src/common/data/js/controller/modal/ConfigureYubiKeyOTPCtrl.js",
"src/common/data/js/controller/modal/CreateDatastoreCtrl.js",
"src/common/data/js/controller/modal/CreateAPIKeyCtrl.js",
"src/common/data/js/controller/modal/CreateFileExchangeCtrl.js",
"src/common/data/js/controller/modal/EditAPIKeyCtrl.js",
"src/common/data/js/controller/modal/EditDatastoreCtrl.js",
"src/common/data/js/controller/modal/DeleteDatastoreCtrl.js",
"src/common/data/js/controller/modal/DatastoreNewEntryCtrl.js",
"src/common/data/js/controller/modal/DisplayShareRightsCtrl.js",
"src/common/data/js/controller/modal/EditEntryCtrl.js",
"src/common/data/js/controller/modal/EditFileExchangeCtrl.js",
"src/common/data/js/controller/modal/EditFolderCtrl.js",
"src/common/data/js/controller/modal/GoOfflineCtrl.js",
"src/common/data/js/controller/modal/HistoryCtrl.js",
......@@ -212,6 +214,7 @@ var build = function(build_path, type) {
"src/common/data/js/controller/KnownHostsCtrl.js",
"src/common/data/js/controller/OtherDatastoreCtrl.js",
"src/common/data/js/controller/OtherAPIKeyCtrl.js",
"src/common/data/js/controller/OtherFileExchangeCtrl.js",
"src/common/data/js/controller/ExportCtrl.js",
"src/common/data/js/controller/ImportCtrl.js",
"src/common/data/js/controller/PanelCtrl.js",
......@@ -224,6 +227,7 @@ var build = function(build_path, type) {
"src/common/data/js/controller/Enforce2FaCtrl.js",
"src/common/data/js/service/api-client.js",
"src/common/data/js/service/api-gcp.js",
"src/common/data/js/service/api-fileserver.js",
"src/common/data/js/service/api-pwnedpasswords.js",
"src/common/data/js/service/helper.js",
......@@ -249,6 +253,7 @@ var build = function(build_path, type) {
"src/common/data/js/service/manager-export.js",
"src/common/data/js/service/manager-file-transfer.js",
"src/common/data/js/service/manager-file-link.js",
"src/common/data/js/service/manager-file-exchange.js",
"src/common/data/js/service/manager-hosts.js",
"src/common/data/js/service/manager-import.js",
"src/common/data/js/service/manager-security-report.js",
......
......@@ -174,12 +174,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -208,6 +210,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -220,6 +223,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -245,6 +249,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -101,12 +101,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -135,6 +137,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -147,6 +150,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -172,6 +176,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -407,12 +407,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -441,6 +443,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -453,6 +456,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -478,6 +482,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -149,12 +149,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -183,6 +185,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -195,6 +198,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -220,6 +224,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -281,12 +281,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -315,6 +317,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -327,6 +330,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -352,6 +356,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -174,12 +174,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -208,6 +210,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -220,6 +223,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -245,6 +249,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -491,12 +491,14 @@
<script src="js/controller/modal/ConfigureYubiKeyOTPCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/CreateFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DeleteDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DatastoreNewEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/DisplayShareRightsCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditEntryCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/EditFolderCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/GoOfflineCtrl.js" type="application/javascript"></script>
<script src="js/controller/modal/HistoryCtrl.js" type="application/javascript"></script>
......@@ -525,6 +527,7 @@
<script src="js/controller/KnownHostsCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherDatastoreCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherAPIKeyCtrl.js" type="application/javascript"></script>
<script src="js/controller/OtherFileExchangeCtrl.js" type="application/javascript"></script>
<script src="js/controller/ExportCtrl.js" type="application/javascript"></script>
<script src="js/controller/ImportCtrl.js" type="application/javascript"></script>
<script src="js/controller/PanelCtrl.js" type="application/javascript"></script>
......@@ -537,6 +540,7 @@
<script src="js/controller/Enforce2FaCtrl.js" type="application/javascript"></script>
<script src="js/service/api-client.js" type="application/javascript"></script>
<script src="js/service/api-gcp.js" type="application/javascript"></script>
<script src="js/service/api-fileserver.js" type="application/javascript"></script>
<script src="js/service/api-pwnedpasswords.js" type="application/javascript"></script>
<script src="js/service/helper.js" type="application/javascript"></script>
......@@ -562,6 +566,7 @@
<script src="js/service/manager-export.js" type="application/javascript"></script>
<script src="js/service/manager-file-transfer.js" type="application/javascript"></script>
<script src="js/service/manager-file-link.js" type="application/javascript"></script>
<script src="js/service/manager-file-exchange.js" type="application/javascript"></script>
<script src="js/service/manager-hosts.js" type="application/javascript"></script>
<script src="js/service/manager-import.js" type="application/javascript"></script>
<script src="js/service/manager-security-report.js" type="application/javascript"></script>
......
......@@ -209,7 +209,7 @@
if (offlineCache.is_active() && offlineCache.is_locked()) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-unlock-offline-cache.html',
templateUrl: 'view/modal/unlock-offline-cache.html',
controller: 'ModalUnlockOfflineCacheCtrl',
backdrop: 'static',
resolve: {
......
......@@ -42,7 +42,8 @@
managerFileTransfer.register('download_complete', function() {
$scope.state.closed_request = $scope.state.closed_request + 1;
$scope.state.percentage_complete = Math.round($scope.state.closed_request / $scope.state.open_requests * 1000) / 10;
$scope.state.percentage_complete = 100;
$scope.state.processing = true;
$scope.state.next_step = 'DOWNLOAD_COMPLETED';
});
......
......@@ -71,7 +71,7 @@
function show_history(node) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-history.html',
templateUrl: 'view/modal/history.html',
controller: 'ModalHistoryCtrl',
resolve: {
node: function () {
......
......@@ -35,7 +35,7 @@
read_gpg()
} else {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-unlock-offline-cache.html',
templateUrl: 'view/modal/unlock-offline-cache.html',
controller: 'ModalUnlockOfflineCacheCtrl',
backdrop: 'static',
resolve: {
......
......@@ -64,7 +64,7 @@
write_pgp()
} else {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-unlock-offline-cache.html',
templateUrl: 'view/modal/unlock-offline-cache.html',
controller: 'ModalUnlockOfflineCacheCtrl',
backdrop: 'static',
resolve: {
......@@ -348,7 +348,7 @@
function open_address_book(email) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-add-gpg-receiver.html',
templateUrl: 'view/modal/add-gpg-receiver.html',
controller: 'ModalAddGPGReceiverCtrl',
resolve: {
email: function() {
......@@ -398,7 +398,7 @@
function edit_gpg_user(user) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-edit-gpg-user.html',
templateUrl: 'view/modal/edit-gpg-user.html',
controller: 'ModalEditGPGUserCtrl',
resolve: {
user: function() {
......
......@@ -52,7 +52,7 @@
*/
function create_group(size) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-new-group.html',
templateUrl: 'view/modal/new-group.html',
controller: 'ModalNewGroupCtrl',
size: size,
resolve: {}
......@@ -89,7 +89,7 @@
function edit_group(group_id, size) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-edit-group.html',
templateUrl: 'view/modal/edit-group.html',
controller: 'ModalEditGroupCtrl',
size: size,
resolve: {
......@@ -175,7 +175,7 @@
function leave_group(group) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-verify.html',
templateUrl: 'view/modal/verify.html',
controller: 'ModalVerifyCtrl',
resolve: {
title: function () {
......@@ -221,7 +221,7 @@
function delete_group(group_id) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-verify.html',
templateUrl: 'view/modal/verify.html',
controller: 'ModalVerifyCtrl',
resolve: {
title: function () {
......@@ -265,7 +265,7 @@
function accept_group(group) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-accept-share.html',
templateUrl: 'view/modal/accept-share.html',
controller: 'ModalAcceptShareCtrl',
resolve: {
title: function () {
......@@ -351,7 +351,7 @@
var outstanding_share_index = $scope.outstanding_share_index[group.group_id];
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-accept-share.html',
templateUrl: 'view/modal/accept-share.html',
controller: 'ModalAcceptShareCtrl',
resolve: {
title: function () {
......
......@@ -104,7 +104,7 @@
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-create-datastore.html',
templateUrl: 'view/modal/create-datastore.html',
controller: 'ModalCreateDatastoreCtrl',
resolve: {}
});
......@@ -137,7 +137,7 @@
*/
function go_offline() {
$uibModal.open({
templateUrl: 'view/modal-go-offline.html',
templateUrl: 'view/modal/go-offline.html',
controller: 'ModalGoOfflineCtrl',
backdrop: 'static',
resolve: {
......
......@@ -53,7 +53,7 @@
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-create-api-key.html',
templateUrl: 'view/modal/create-api-key.html',
controller: 'ModalCreateAPIKeyCtrl',
resolve: {}
});
......@@ -86,7 +86,7 @@
var onSuccess = function(api_key) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-edit-api-key.html',
templateUrl: 'view/modal/edit-api-key.html',
controller: 'ModalEditAPIKeyCtrl',
resolve: {
api_key: function () {
......@@ -118,7 +118,7 @@
function delete_api_key(api_key) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-verify.html',
templateUrl: 'view/modal/verify.html',
controller: 'ModalVerifyCtrl',
resolve: {
title: function () {
......
......@@ -19,11 +19,12 @@
var default_tab = 'sessions';
var tabs = {
'sessions': 0,
'api-keys': 1,
'data-stores': 2,
'known-hosts': 3,
'export': 4,
'import': 5
'data-stores': 1,
'api-keys': 2,
'file-exchanges': 3,
'known-hosts': 4,
'export': 5,
'import': 6
};
......
......@@ -57,7 +57,7 @@
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-create-datastore.html',
templateUrl: 'view/modal/create-datastore.html',
controller: 'ModalCreateDatastoreCtrl',
resolve: {}
});
......@@ -93,7 +93,7 @@
function edit_data_store(data_store) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-edit-datastore.html',
templateUrl: 'view/modal/edit-datastore.html',
controller: 'ModalEditDatastoreCtrl',
resolve: {
data_store: function () {
......@@ -133,7 +133,7 @@
function delete_datastore(data_store) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal-delete-datastore.html',
templateUrl: 'view/modal/delete-datastore.html',
controller: 'ModalDeleteDatastoreCtrl',
resolve: {
data_store: function () {
......
(function(angular) {
'use strict';
/**
* @ngdoc controller
* @name psonocli.controller:OtherFileExchangeCtrl
* @requires $scope
* @requires $uibModal
* @requires psonocli.managerFileExchange
*
* @description
* Controller for the Datastore tab in the "Others" menu
*/
angular.module('psonocli').controller('OtherFileExchangeCtrl', ['$scope', '$uibModal', 'managerFileExchange',
function ($scope, $uibModal, managerFileExchange) {
$scope.create_new_file_exchange = create_new_file_exchange;
$scope.edit_file_exchange = edit_file_exchange;
$scope.delete_file_exchange = delete_file_exchange;
$scope.file_exchanges_disabled = managerFileExchange.file_exchanges_disabled();
$scope.file_exchanges=[];
activate();
function activate() {
read_file_exchanges();
}
/**
* @ngdoc
* @name psonocli.controller:OtherFileExchangeCtrl#read_file_exchanges
* @methodOf psonocli.controller:OtherFileExchangeCtrl
*
* @description
* Reads all api keys from the backend
*/
function read_file_exchanges() {
managerFileExchange.read_file_exchanges().then(function (file_exchanges) {
$scope.file_exchanges=file_exchanges;
});
}
/**
* @ngdoc
* @name psonocli.controller:OtherFileExchangeCtrl#create_new_file_exchange
* @methodOf psonocli.controller:OtherFileExchangeCtrl
*
* @description
* Creates a new datastore
*/
function create_new_file_exchange() {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal/create-file-exchange.html',
controller: 'ModalCreateFileExchangeCtrl',
resolve: {}
});
modalInstance.result.then(function () {
read_file_exchanges();
}, function () {
// cancel triggered
});
}
/**
* @ngdoc
* @name psonocli.controller:OtherFileExchangeCtrl#edit_file_exchange
* @methodOf psonocli.controller:OtherFileExchangeCtrl
*
* @description
* edits an file_exchanges
*
* @param {TreeObject} file_exchange The file_exchange to edit
*/
function edit_file_exchange(file_exchange) {
var onError = function(result) {
// pass
};
var onSuccess = function(file_exchange) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal/edit-file-exchange.html',
controller: 'ModalEditFileExchangeCtrl',
resolve: {
file_exchange: function () {
return file_exchange;
}
}
});
modalInstance.result.then(function (form) {
// save triggered
}, function () {
// cancel triggered
});
};
return managerFileExchange.read_file_exchange(file_exchange['id'])
.then(onSuccess, onError);
}
/**
* @ngdoc
* @name psonocli.controller:OtherFileExchangeCtrl#delete_file_exchange
* @methodOf psonocli.controller:OtherFileExchangeCtrl
*
* @description
* deletes an file_exchange
*
* @param {TreeObject} file_exchange The file_exchange to delete
*/
function delete_file_exchange(file_exchange) {
var modalInstance = $uibModal.open({
templateUrl: 'view/modal/verify.html',
controller: 'ModalVerifyCtrl',
resolve: {
title: function () {
return 'DELETE_FILE_EXCHANGE';
},
description: function () {
return 'DELETE_FILE_EXCHANGE_WARNING';
}
}
});
modalInstance.result.then(function () {
// User clicked the yes button
var onSuccess = function(){
for (var i = $scope.file_exchanges.length - 1; i >= 0; i--) {
if ($scope.file_exchanges[i].id !== file_exchange.id) {
continue;
}
$scope.file_exchanges.splice(i, 1);
}