Merge v4.8.0.4 to master

library/Opus/Licence.php

@@ -117,6 +117,7 @@ protected function init()
     {
         $active = new Field('Active');
         $active->setCheckbox(true);
+        $active->setType('bool');
 
         $commentInternal = new Field('CommentInternal');
         $commentInternal->setTextarea(true);
@@ -152,6 +153,7 @@ protected function init()
 
         $podAllowed = new Field('PodAllowed');
         $podAllowed->setCheckbox(true);
+        $podAllowed->setType('bool');
 
         $this->addField($active)
             ->addField($commentInternal)

library/Opus/Model/Field.php

@@ -324,8 +324,18 @@ public function setValue($value)
             }
         } else {
             // strong comparison for other values
-            if ($value === $this->value) {
-                return $this;
+            switch($this->getType()) {
+                case 'bool':
+                    // Initially the stored value is null which matches false, but field needs to be set
+                    // TODO better way?
+                    if ((bool) $value === (bool) $this->value && ($this->value !== null || $value === null)) {
+                        return $this;
+                    }
+                    break;
+                default:
+                    if ($value === $this->value) {
+                        return $this;
+                    }
             }
         }
 

library/Opus/Model/Plugin/updatedocument_filter.ini

@@ -27,6 +27,7 @@ Opus\DnbInstitute[]=DnbContactId
 Opus\DnbInstitute[]=IsGrantor
 Opus\DnbInstitute[]=IsPublisher
 
+Opus\Licence[]=Active
 Opus\Licence[]=SortOrder
 Opus\Licence[]=CommentInternal
 Opus\Licence[]=PodAllowed

tests/Opus/LicenceTest.php

@@ -407,4 +407,21 @@ public function testAddLicence()
 
         $this->assertEquals($licenceId, $licences[0]->getId());
     }
+
+    public function testIsModified()
+    {
+        $licence = Licence::new();
+        $licence->setNameLong('Test Licence');
+        $licence->setLinkLicence('http://www.example.org/licence');
+        $licence->setActive(true);
+        $licenceId = $licence->store();
+
+        $licence = Licence::get($licenceId);
+
+        $this->assertFalse($licence->isModified());
+
+        $licence->setActive('1');
+
+        $this->assertFalse($licence->isModified());
+    }
 }

tests/Opus/Model/Plugin/InvalidateDocumentCacheTest.php

@@ -73,6 +73,8 @@ public function setUp(): void
             'collections_roles',
             'collections',
             'link_documents_collections',
+            'document_licences',
+            'link_documents_licences',
         ]);
 
         $this->collectionRole = new CollectionRole();
@@ -703,4 +705,35 @@ public function testStoringUnchangedDocumentDoesNotUpdateServerDateModified()
         $doc->store();
         $this->assertEquals($lastModified, $doc->getServerDateModified()->getUnixTimestamp());
     }
+
+    public function testLicenceActiveDoesNotUpdateServerDateModified()
+    {
+        $doc = new Document();
+
+        $licence = new Licence();
+        $licence->setLanguage('deu');
+        $licence->setNameLong('Test Licence');
+        $licence->setLinkLicence('http://long.org/licence');
+        $licence->setActive(1);
+        $licenceId = $licence->store();
+
+        $doc->setLicence([$licence]);
+        $docId = $doc->store();
+
+        $doc = new Document($docId);
+
+        $this->assertCount(1, $doc->getLicence());
+
+        $serverDateModified = $doc->getServerDateModified()->getUnixTimestamp();
+
+        sleep(2);
+
+        $licence = new Licence($licenceId);
+        $licence->setActive(true);
+        $licence->store();
+
+        $doc = new Document($docId);
+
+        $this->assertEquals($serverDateModified, $doc->getServerDateModified()->getUnixTimestamp());
+    }
 }