From 4b059e07895db0b0851d192dd3607e0a818c0cf6 Mon Sep 17 00:00:00 2001 From: Alexis Ragot Date: Thu, 13 Sep 2018 11:49:56 +0200 Subject: [PATCH 1/3] Fix actions on the integrity check and description access of journal archives --- .../journal/lifeCycleJournalInterface.php | 9 ------- .../journal/searchLogArchiveInterface.php | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/presentation/maarchRM/UserStory/journal/lifeCycleJournalInterface.php b/src/presentation/maarchRM/UserStory/journal/lifeCycleJournalInterface.php index ea8cb9781..aaf920d2f 100755 --- a/src/presentation/maarchRM/UserStory/journal/lifeCycleJournalInterface.php +++ b/src/presentation/maarchRM/UserStory/journal/lifeCycleJournalInterface.php @@ -45,15 +45,6 @@ interface lifeCycleJournalInterface */ public function readJournals($eventType = false, $objectClass = false, $objectId = false, $minDate = false, $maxDate = false); - /** - * Check integrity of log - * @param string $archiveId - * - * @uses lifeCycle/journal/checkIntegrity - * @return recordsManagement/log/checkIntegrity - */ - public function readJournal_journalId_Checkintegrity($archiveId); - /** * Get the current journal * @param id $journalId The identifier of the journal diff --git a/src/presentation/maarchRM/UserStory/journal/searchLogArchiveInterface.php b/src/presentation/maarchRM/UserStory/journal/searchLogArchiveInterface.php index 890683396..acd27bca5 100755 --- a/src/presentation/maarchRM/UserStory/journal/searchLogArchiveInterface.php +++ b/src/presentation/maarchRM/UserStory/journal/searchLogArchiveInterface.php @@ -45,4 +45,30 @@ interface searchLogArchiveInterface * @uses recordsManagement/log/contents_type__archiveId__resourceId_ */ public function readLogContents_type__archiveId__resourceId_(); + + /** + * Check integrity of log + * @param string $archiveId + * + * @uses lifeCycle/journal/checkIntegrity + * @return recordsManagement/log/checkIntegrity + */ + public function readJournal_journalId_Checkintegrity($archiveId); + + /** + * View the archive + * + * @return recordsManagement/archive/getDescription The recordsManagement/archive object + * @uses recordsManagement/archiveDescription/read_archiveId_ + */ + public function readRecordsmanagementArchivedescription_archiveId_(); + + /** + * Retrieve an archive content document (CDO) + * + * @return recordsManagement/archive/getContents + * + * @uses recordsManagement/archive/readConsultation_archiveId_Digitalresource_resId_ + */ + public function readRecordsmanagementContents_archiveId__resId_(); } \ No newline at end of file -- GitLab From 7aa76c548fd68e70c6722e058e6b8d8d818dcf72 Mon Sep 17 00:00:00 2001 From: Alexis Ragot Date: Thu, 13 Sep 2018 11:52:21 +0200 Subject: [PATCH 2/3] removed a specific public archive test --- .../maarchRM/Presenter/recordsManagement/archive.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php index 9305f2172..7503b5989 100755 --- a/src/presentation/maarchRM/Presenter/recordsManagement/archive.php +++ b/src/presentation/maarchRM/Presenter/recordsManagement/archive.php @@ -243,7 +243,6 @@ class archive || ($currentService->registrationNumber === $archive->archiverOrgRegNumber && in_array('archiver', $currentService->orgRoleCodes))) && $hasModificationMetadata - && $archive->messages[0]->schema != 'seda2' && $archive->descriptionClass != "recordsManagement/log" && $archive->status === "preserved" && $publicArchives) { -- GitLab From a511a67a0ea299731eb23c7b6a9443ca3ca2e204 Mon Sep 17 00:00:00 2001 From: Alexis Ragot Date: Thu, 27 Sep 2018 08:49:01 +0200 Subject: [PATCH 3/3] hotfix/2.2.3 --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index b1b25a5ff..585940699 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -2.2.2 +2.2.3 -- GitLab