Fix update function for 'Language and script notes'. (#13657) (#1664)

artefactual · Oct 4, 2023 · 7e25350 · 7e25350
1 parent a1ebb2f
commit 7e25350
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/lib/model/QubitObject.php b/lib/model/QubitObject.php
@@ -305,6 +305,33 @@ public function getStatus($options = [])
         return QubitStatus::getOne($criteria);
     }
 
+    /**
+     * Check to see if note is saved in memory (field was updated).
+     *
+     * Used by ISAD, DACS, and RAD templates when duplicating a description,
+     * specifcally for updating the 'Language and script notes' field.
+     *
+     * @return array $notes
+     */
+    public function getMemoryNotesByType(array $options = [])
+    {
+        // Check memory for notes
+        if (!count($this->notes) < 0) {
+            return $this->getNotesByType($options);
+        }
+
+        $noteTypeId = $options['noteTypeId'];
+        $notes = new ArrayObject();
+
+        foreach ($this->notes as $note) {
+            if ($note->typeId == $noteTypeId) {
+                $notes->append($note);
+            }
+        }
+
+        return $notes;
+    }
+
     public function getNotesByType(array $options = [])
     {
         $criteria = new Criteria();

diff --git a/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php b/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
@@ -70,12 +70,20 @@ public function __set($name, $value)
     {
         switch ($name) {
             case 'languageNotes':
-                $note = $this->resource->getNotesByType(['noteTypeId' => QubitTerm::LANGUAGE_NOTE_ID])->offsetGet(0);
+                $note = $this->resource->getMemoryNotesByType(['noteTypeId' => QubitTerm::LANGUAGE_NOTE_ID])->offsetGet(0);
+
                 $missingNote = 0 === count($note);
 
                 if (0 == strlen($value)) {
                     // Delete note if it's available
                     if (!$missingNote) {
+                        // Update deleted note on duplication
+                        if (!isset($value)) {
+                            $note->content = $value;
+
+                            break;
+                        }
+
                         $note->delete();
                     }
 

diff --git a/plugins/sfRadPlugin/lib/sfRadPlugin.class.php b/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
@@ -104,7 +104,7 @@ public function setProperty($name, $value)
                 return $this;
 
             case 'languageNotes':
-                $note = $this->resource->getNotesByType(['noteTypeId' => QubitTerm::LANGUAGE_NOTE_ID])->offsetGet(0);
+                $note = $this->resource->getMemoryNotesByType(['noteTypeId' => QubitTerm::LANGUAGE_NOTE_ID])->offsetGet(0);
                 $missingNote = 0 === count($note);
 
                 if (0 == strlen($value)) {