diff --git a/modules/invenio-deposit/invenio_deposit/static/templates/invenio_deposit/decorators/array.html b/modules/invenio-deposit/invenio_deposit/static/templates/invenio_deposit/decorators/array.html index d172a1d5a5..f95b7e5a6c 100644 --- a/modules/invenio-deposit/invenio_deposit/static/templates/invenio_deposit/decorators/array.html +++ b/modules/invenio-deposit/invenio_deposit/static/templates/invenio_deposit/decorators/array.html @@ -22,14 +22,29 @@
  • -
    - +
    +
    + +
    +
    +
    +
    + +
  • diff --git a/modules/weko-items-ui/weko_items_ui/static/js/weko_items_ui/app.js b/modules/weko-items-ui/weko_items_ui/static/js/weko_items_ui/app.js index 948496dfd2..7a19ff1cbb 100644 --- a/modules/weko-items-ui/weko_items_ui/static/js/weko_items_ui/app.js +++ b/modules/weko-items-ui/weko_items_ui/static/js/weko_items_ui/app.js @@ -4627,6 +4627,42 @@ function validateThumbnails(rootScope, scope, itemSizeCheckFlg, files) { 'invenioRecords', 'wekoRecords.controllers', ]); + + function FileNameCheckCtrl($scope, $rootScope){ + $scope.deleteFromArrayFile = function(item, modelArray) { + // get uploaded files + let fileObjects={}; + let filesVM = $rootScope["filesVM"]; + if (filesVM && filesVM.hasOwnProperty("files")){ + let filesUploaded = filesVM.files; + filesUploaded.forEach(function(file){ + fileObjects[file.key] = file["version_id"]; + }); + } + // delete data + + if (modelArray) { + target = modelArray[item]; + let flg = true; + if (fileObjects[target.filename] != undefined){ + if (fileObjects[target.filename] == target.version_id){ + flg = false; + } + } + if (flg){ + modelArray.splice(item, 1); + } + } + return modelArray; + } + } + + FileNameCheckCtrl.$inject = [ + '$scope', + '$rootScope', + ]; + angular.module('fileNameCheck',[]) + .controller('FileNameCheckCtrl', FileNameCheckCtrl); angular.module('uploadThumbnail', ['schemaForm', 'invenioFiles']) .controller('UploadController', function ($scope, $rootScope, InvenioFilesAPI) { @@ -4847,7 +4883,7 @@ function validateThumbnails(rootScope, scope, itemSizeCheckFlg, files) { 'mgcrea.ngStrap.modal', 'pascalprecht.translate', 'ui.sortable', 'ui.select', 'mgcrea.ngStrap.select', 'mgcrea.ngStrap.datepicker', 'mgcrea.ngStrap.helpers.dateParser', 'mgcrea.ngStrap.tooltip', - 'invenioFiles', 'uploadThumbnail' + 'invenioFiles', 'uploadThumbnail', 'fileNameCheck' ] ); });