Commit 4213fc9d authored by Arnaud Pauget's avatar Arnaud Pauget
Browse files

Merge branch 'release/2.7.3' into 'Support/2.7.X'

Release/2.7.3

See merge request maarch/archivesPubliques!230
parents d3dd37e6 f0f79419
# CHANGELOG
## Version 2.7.3
- `Fixed` Erreur d'affichage des ressources dans les bordereaux d'élimination.
## Version 2.7.2
- `Fixed` Mauvaise interpretation de la balise nonRepudiation dans un bordereau seda2.
- `Fixed` Traductions.
......
......@@ -38,11 +38,11 @@ class ArchiveDestructionRequest extends abstractMessage
$archiveDestructionRequest->archivalAgency = $this->sendOrganization($message->recipientOrg);
$archiveDestructionRequest->requester = $this->sendOrganization($message->senderOrg);
foreach ($message->unitIdentifier as $unitIdentifier) {
$archiveDestructionRequest->unitIdentifier[] = $this->sendUnitIdentifier($unitIdentifier);
}
$archiveDestructionRequest->dataObjectPackage = $this->sendDataObjectPackage($message, true);
$archiveDestructionRequest->dataObjectPackage = $this->sendDataObjectPackage($message, false);
}
}
......@@ -307,8 +307,8 @@ abstract class abstractMessage
}
}
if (!empty($identifiers)) {
$dataObjectPackage->binaryDataObject = [];
$dataObjectPackage->binaryDataObject = [];
if (!empty($identifiers) && $withAttachment) {
foreach ($identifiers as $identifier) {
$dataObjectPackage->binaryDataObject = array_merge($dataObjectPackage->binaryDataObject, $this->sendBinaryDataObject($message, $identifier->objectId, $withAttachment));
}
......
......@@ -5,7 +5,7 @@
<?merge .binaryDataObject.bool() ?>
<?merge .binaryDataObject ?>
<?xinclude seda2/BinaryDataObject.xml ?>
<?merge .physicalDataObject.bool() ?>
<?merge .physicalDataObject ?>
<?xinclude seda2/PhysicalDataObject.xml ?>
......@@ -13,20 +13,19 @@
<?merge .logBook ?>
<?xinclude seda2/LogBook.xml ?>
</DataObjectGroup>
<?merge $dataObjectPackage.binaryDataObject.bool() ?>
<?merge $dataObjectPackage.binaryDataObject ?>
<?xinclude seda2/BinaryDataObject.xml ?>
<?merge $dataObjectPackage.physicalDataObject.bool() ?>
<?merge $dataObjectPackage.physicalDataObject ?>
<?xinclude seda2/PhysicalDataObject.xml ?>
<DescriptiveMetadata>
<?merge $dataObjectPackage.descriptiveMetadata.archiveUnit ?>
<?xinclude seda2/ArchiveUnit.xml ?>
</DescriptiveMetadata>
<?merge $dataObjectPackage.managementMetadata $managementMetadata ?>
<ManagementMetadata>
<?xinclude seda2/ManagementMetadata.xml ?>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment