From 879004b91e6a31794d34fd8bece4d4ad25591b6c Mon Sep 17 00:00:00 2001
From: AGO <alexandre.goldstein@maarch.org>
Date: Tue, 4 Aug 2020 17:30:14 +0200
Subject: [PATCH 1/5] feat/14376 : add displayFormat in conf to show/hide in
 modificationModal

---
 data/maarchRM/conf/configuration.ini.default               | 5 +++++
 .../Controller/archiveModificationTrait.php                | 4 ++++
 .../medona/message/modificationMessageCommentFrom.html     | 2 +-
 .../view/recordsManagement/archive/modalModification.html  | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/data/maarchRM/conf/configuration.ini.default b/data/maarchRM/conf/configuration.ini.default
index f32e665dd..a146b88bc 100755
--- a/data/maarchRM/conf/configuration.ini.default
+++ b/data/maarchRM/conf/configuration.ini.default
@@ -156,6 +156,11 @@ chainWithTimestamp = false;
 ; false = Disable
 transaction = false
 
+;To display and choose the message's format on modification Request
+; true = visible
+; false = hidden
+formatDisplay = false
+
 ; Path to the message exchange directory
 messageDirectory = "%laabsDirectory%/data/maarchRM/medona"
 
diff --git a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
index 5a4d9da68..d44e888b8 100755
--- a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
@@ -96,6 +96,10 @@ trait archiveModificationTrait
                 $retentionRule->retentionDuration = $refRetentionRule->duration;
             }
         }
+        
+        if (isset(\laabs::configuration("medona")['formatDisplay'])) {
+            $formatDisplay = \laabs::configuration("medona")['formatDisplay'];
+        }
 
         $retentionRuleReceived = $retentionRule;
 
diff --git a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
index 40198ce19..ca65a96b9 100644
--- a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
+++ b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
@@ -22,7 +22,7 @@
                             <td><strong>Message identifier</strong></td>
                             <td><input class="form-control" name="identifier" id="identifier" placeholder="Identifier"></td> 
                         <tr>
-                        <tr>
+                        <tr id="messageFormatTr">
                             <td><strong>Message format</strong></td>
                             <td>
                                 <select class="form-control" name="format" id="format">
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
index 2dd00800d..aff51edac 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
@@ -128,6 +128,13 @@
                 $('#derogationInputTr').hide();
             }
 
+            //TODO change condition below user set formatDisplay to true
+            // if (type === 'requestModification' && formatDisplay === false)
+            if (type === 'requestModification')
+            {
+                $('#messageFormatTr').hide();
+            }
+
             if (!transaction) {
                 $('#message').hide();
             }
-- 
GitLab


From 2a47243fa4557da05ccc01a4cd5ac0cf3d6820c0 Mon Sep 17 00:00:00 2001
From: AGO <alexandre.goldstein@maarch.org>
Date: Wed, 5 Aug 2020 10:58:06 +0200
Subject: [PATCH 2/5] wip

---
 .../Controller/archiveModificationTrait.php                | 7 ++++---
 .../view/recordsManagement/archive/modalModification.html  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
index d44e888b8..608bb0bba 100755
--- a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
@@ -97,9 +97,6 @@ trait archiveModificationTrait
             }
         }
         
-        if (isset(\laabs::configuration("medona")['formatDisplay'])) {
-            $formatDisplay = \laabs::configuration("medona")['formatDisplay'];
-        }
 
         $retentionRuleReceived = $retentionRule;
 
@@ -479,6 +476,10 @@ trait archiveModificationTrait
                 $this->validateDescriptionModel($descriptionObject, $this->currentArchivalProfile);
             }
 
+            if (isset(\laabs::configuration("medona")['formatDisplay']) && \laabs::configuration("medona")['formatDisplay']) {
+                $formatDisplay = \laabs::configuration("medona")['formatDisplay'];
+            }
+
             $descriptionController = $this->useDescriptionController($archive->descriptionClass);
 
             $archive->descriptionObject = $descriptionObject;
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
index aff51edac..1d3d7ec2d 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
@@ -128,7 +128,7 @@
                 $('#derogationInputTr').hide();
             }
 
-            //TODO change condition below user set formatDisplay to true
+            //TODO change condition below if user set formatDisplay to true
             // if (type === 'requestModification' && formatDisplay === false)
             if (type === 'requestModification')
             {
-- 
GitLab


From 99fcfb3af79b06dffba3d6b6e49af1df56ef3d11 Mon Sep 17 00:00:00 2001
From: AGO <alexandre.goldstein@maarch.org>
Date: Wed, 5 Aug 2020 17:54:33 +0200
Subject: [PATCH 3/5] feat/14376 : remove displayFormat from conf (Socle)

---
 data/maarchRM/conf/configuration.ini.default                 | 5 -----
 .../view/medona/message/modificationMessageCommentFrom.html  | 1 +
 .../view/recordsManagement/archive/modalModification.html    | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/data/maarchRM/conf/configuration.ini.default b/data/maarchRM/conf/configuration.ini.default
index a146b88bc..f32e665dd 100755
--- a/data/maarchRM/conf/configuration.ini.default
+++ b/data/maarchRM/conf/configuration.ini.default
@@ -156,11 +156,6 @@ chainWithTimestamp = false;
 ; false = Disable
 transaction = false
 
-;To display and choose the message's format on modification Request
-; true = visible
-; false = hidden
-formatDisplay = false
-
 ; Path to the message exchange directory
 messageDirectory = "%laabsDirectory%/data/maarchRM/medona"
 
diff --git a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
index ca65a96b9..742a7f206 100644
--- a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
+++ b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
@@ -22,6 +22,7 @@
                             <td><strong>Message identifier</strong></td>
                             <td><input class="form-control" name="identifier" id="identifier" placeholder="Identifier"></td> 
                         <tr>
+                        <?merge formatDisplay.bool() ?>
                         <tr id="messageFormatTr">
                             <td><strong>Message format</strong></td>
                             <td>
diff --git a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
index 1d3d7ec2d..ca1f5460d 100755
--- a/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
+++ b/src/presentation/maarchRM/Resources/view/recordsManagement/archive/modalModification.html
@@ -128,10 +128,7 @@
                 $('#derogationInputTr').hide();
             }
 
-            //TODO change condition below if user set formatDisplay to true
-            // if (type === 'requestModification' && formatDisplay === false)
-            if (type === 'requestModification')
-            {
+            if (type === 'requestModification') {
                 $('#messageFormatTr').hide();
             }
 
-- 
GitLab


From a921422de867a8cfa4e2aae5a67e1d1311d8e2c0 Mon Sep 17 00:00:00 2001
From: AGO <alexandre.goldstein@maarch.org>
Date: Tue, 11 Aug 2020 16:47:31 +0200
Subject: [PATCH 4/5] feat/14376: remove condition displayFormat from conf &
 view

---
 .../view/medona/message/modificationMessageCommentFrom.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
index 742a7f206..ca65a96b9 100644
--- a/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
+++ b/src/presentation/maarchRM/Resources/view/medona/message/modificationMessageCommentFrom.html
@@ -22,7 +22,6 @@
                             <td><strong>Message identifier</strong></td>
                             <td><input class="form-control" name="identifier" id="identifier" placeholder="Identifier"></td> 
                         <tr>
-                        <?merge formatDisplay.bool() ?>
                         <tr id="messageFormatTr">
                             <td><strong>Message format</strong></td>
                             <td>
-- 
GitLab


From 6636449fe35eae033eef6aeacb735654bb746b52 Mon Sep 17 00:00:00 2001
From: AGO <alexandre.goldstein@maarch.org>
Date: Tue, 11 Aug 2020 16:50:43 +0200
Subject: [PATCH 5/5] feat/14376: remove displayFormat condition in controller

---
 .../recordsManagement/Controller/archiveModificationTrait.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
index 608bb0bba..9548f61a8 100755
--- a/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
+++ b/src/bundle/recordsManagement/Controller/archiveModificationTrait.php
@@ -476,10 +476,6 @@ trait archiveModificationTrait
                 $this->validateDescriptionModel($descriptionObject, $this->currentArchivalProfile);
             }
 
-            if (isset(\laabs::configuration("medona")['formatDisplay']) && \laabs::configuration("medona")['formatDisplay']) {
-                $formatDisplay = \laabs::configuration("medona")['formatDisplay'];
-            }
-
             $descriptionController = $this->useDescriptionController($archive->descriptionClass);
 
             $archive->descriptionObject = $descriptionObject;
-- 
GitLab