diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php index ff7a9a24377c080c4d5920517dd8bd7aefc319f2..810287aa4a81a516af6d9ee8229eaadab0996c41 100644 --- a/src/app/action/controllers/ActionMethodController.php +++ b/src/app/action/controllers/ActionMethodController.php @@ -920,6 +920,11 @@ class ActionMethodController if (!empty($storeResult['errors'])) { return ['errors' => ["[storeResourceOnDocServer] {$storeResult['errors']}"]]; } + + $alreadySigned = AdrModel::getDocuments(['select' => [1], 'where' => ['type = ?', 'res_id = ?', 'version = ?'], 'data' => ['SIGN', $args['data']['resId'], $targetResource['version']]]); + if (!empty($alreadySigned)) { + AdrModel::deleteDocumentAdr(['where' => ['res_id = ?', 'type in (?)', 'version = ?'], 'data' => [$args['data']['resId'], ['SIGN', 'TNL'], $targetResource['version']]]); + } AdrModel::createDocumentAdr([ 'resId' => $args['data']['resId'], 'type' => 'SIGN', @@ -929,7 +934,6 @@ class ActionMethodController 'version' => $targetResource['version'], 'fingerprint' => $storeResult['fingerPrint'] ]); - } else { $id = StoreController::storeAttachment([ 'encodedFile' => base64_encode(file_get_contents($pathToDocument)), diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php index 396f54a7e98df28d3cf29cbb9df56ff8db59629a..dac99fedfbb0d1495582a0d85227588e4ac61bc5 100755 --- a/src/app/action/controllers/PreProcessActionController.php +++ b/src/app/action/controllers/PreProcessActionController.php @@ -1488,10 +1488,10 @@ class PreProcessActionController } if (empty($resource['filename'])) { - $resourcesInformation['error'][] = ['alt_identifier' => $resource['alt_identifier'], 'res_id' => $resId, 'reason' => 'noFilename']; + $resourcesInformation['error'][] = ['alt_identifier' => $resource['alt_identifier'], 'res_id' => $resId, 'reason' => 'noFile']; continue; } - + $resourcesInformation['success'][] = ['alt_identifier' => $resource['alt_identifier'], 'res_id' => $resId]; }