diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js index 99c07b60..de41440c 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js @@ -11,7 +11,10 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $ $scope.vocabularies = []; // Orphan files to add - $scope.orphanFiles = $stateParams.files ? $stateParams.files : []; + $scope.orphanFiles = []; + if ($stateParams.files) { + $scope.orphanFiles = _.isArray($stateParams.files) ? $stateParams.files : [ $stateParams.files ]; + } /** * Close an alert. diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js index 2d33e949..0317163f 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js @@ -113,22 +113,22 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root id: $stateParams.id } }) - .progress(function(e) { - newfile.progress = parseInt(100.0 * e.loaded / e.total); - }) - .success(function(data) { - // Update local model with real data - newfile.id = data.id; - newfile.size = data.size; + .progress(function(e) { + newfile.progress = parseInt(100.0 * e.loaded / e.total); + }) + .success(function(data) { + // Update local model with real data + newfile.id = data.id; + newfile.size = data.size; - // New file uploaded, increase used quota - $rootScope.userInfo.storage_current += data.size; - }) - .error(function (data) { - newfile.status = $translate.instant('document.view.content.upload_error'); - if (data.type === 'QuotaReached') { - newfile.status += ' - ' + $translate.instant('document.view.content.upload_error_quota'); - } - }); + // New file uploaded, increase used quota + $rootScope.userInfo.storage_current += data.size; + }) + .error(function (data) { + newfile.status = $translate.instant('document.view.content.upload_error'); + if (data.type === 'QuotaReached') { + newfile.status += ' - ' + $translate.instant('document.view.content.upload_error_quota'); + } + }); }; }); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js index 45b86c10..5e80f083 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js @@ -7,7 +7,8 @@ angular.module('docs').controller('FileView', function($uibModal, $state, $state var modal = $uibModal.open({ windowClass: 'modal modal-fileview', templateUrl: 'partial/docs/file.view.html', - controller: 'FileModalView' + controller: 'FileModalView', + size: 'lg' }); // Returns to document view on file close diff --git a/docs-web/src/main/webapp/src/app/share/controller/FileView.js b/docs-web/src/main/webapp/src/app/share/controller/FileView.js index 9ae22d2d..3df5724e 100644 --- a/docs-web/src/main/webapp/src/app/share/controller/FileView.js +++ b/docs-web/src/main/webapp/src/app/share/controller/FileView.js @@ -7,7 +7,8 @@ angular.module('share').controller('FileView', function($uibModal, $state, $stat var modal = $uibModal.open({ windowClass: 'modal modal-fileview', templateUrl: 'partial/share/file.view.html', - controller: 'FileModalView' + controller: 'FileModalView', + size: 'lg' }); // Returns to share view on file close diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html index 24b22bb3..dda7e611 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.default.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html @@ -1,62 +1,70 @@