From d05986563c4ace4f09aa5038b46ad606fbee6406 Mon Sep 17 00:00:00 2001
From: mneufing <90395016+mneufing@users.noreply.github.com>
Date: Thu, 9 Sep 2021 16:59:45 +0200
Subject: [PATCH 01/14] Fix for #420
Fehler in XMetaDissPlus-Ausgabe, wenn eine Autor:in keinen Vornamen hat, behoben.
---
.../scripts/index/prefixes/XMetaDissPlus.xslt | 35 ++++++++++++-------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt b/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
index e95508ed35..a3f8049117 100644
--- a/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
+++ b/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
@@ -287,22 +287,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
From 53c3ef86a5c63fe9d516f952c8b7dac5282689ca Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Tue, 14 Sep 2021 15:29:44 +0200
Subject: [PATCH 02/14] #420 Updated unit test New handling of person without
first name in XMetaDissPlus
---
tests/modules/oai/controllers/IndexControllerTest.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/modules/oai/controllers/IndexControllerTest.php b/tests/modules/oai/controllers/IndexControllerTest.php
index aa7e50d122..baf4cb37b0 100644
--- a/tests/modules/oai/controllers/IndexControllerTest.php
+++ b/tests/modules/oai/controllers/IndexControllerTest.php
@@ -1807,7 +1807,8 @@ public function testXMetaDissPlusOmitPersonSurnameIfEmpty()
$this->assertEquals(1, $authorName->length);
$authorFirstName = $xpath->query('//xMetaDiss:xMetaDiss/dc:creator/pc:person/pc:name/pc:foreName');
$this->assertEquals(0, $authorFirstName->length);
- $authorLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:creator/pc:person/pc:name/pc:surName');
+
+ $authorLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:creator/pc:person/pc:name/pc:personEnteredUnderGivenName');
$this->assertEquals(1, $authorLastName->length);
$advisorName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="advisor"]/pc:person/pc:name');
From 3af1ba2a9c990a683473786c6d951f72c17d365c Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 20 Sep 2021 15:58:57 +0200
Subject: [PATCH 03/14] #420 Copied changes for other persons. advisor, editor,
referee
---
RELEASE_NOTES.md | 16 ++-
composer.json | 1 +
.../scripts/index/prefixes/XMetaDissPlus.xslt | 97 ++++++++++++-------
.../oai/controllers/IndexControllerTest.php | 17 +++-
4 files changed, 92 insertions(+), 39 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index cdf2376d7a..bbacc5ce98 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,20 @@
# OPUS 4 Release Notes
-## Release 4.7.0.5 2020-08-17
+## Release 4.7.0.6 2021-09-21
+
+AutorInnen ohne Vornamen werden in XMetaDissPlus nun mit dem Element
+`pc:personEnteredUnderGivenName` abgebildet. Der Nachname kann damit
+auch für Künstlernamen verwendet werden, die keinen Vornamen haben.
+
+```
+
+
+ NACHNAME
+
+
+```
+
+## Release 4.7.0.5 2021-08-17
Dieser Patch Release behebt zwei kleinere Bugs. Das Editieren der Inhalte der
Impressum und Kontakt-Seite ist nun auch von der FAQ-Seite aus ohne Probleme beim
diff --git a/composer.json b/composer.json
index 9192334c4d..98fa4ccbc0 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
+ "phpunit/php-timer": "1.0.9",
"phpunit/dbunit": "~1.3",
"phpunit/phpunit-story": "~1.0",
"phpunit/phpunit-selenium": "~1.4",
diff --git a/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt b/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
index a3f8049117..e199ad6ebd 100644
--- a/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
+++ b/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
@@ -370,21 +370,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -392,16 +401,25 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -414,16 +432,25 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/modules/oai/controllers/IndexControllerTest.php b/tests/modules/oai/controllers/IndexControllerTest.php
index baf4cb37b0..a43fdab03f 100644
--- a/tests/modules/oai/controllers/IndexControllerTest.php
+++ b/tests/modules/oai/controllers/IndexControllerTest.php
@@ -1769,7 +1769,7 @@ public function testListRecordsForEmptySubset()
*
* @covers ::indexAction
*/
- public function testXMetaDissPlusOmitPersonSurnameIfEmpty()
+ public function testXMetaDissPlusUsePersonEnteredUnderGivenNameIfSurnameIsEmpty()
{
$document = $this->createTestDocument();
$document->setServerState('published');
@@ -1795,6 +1795,10 @@ public function testXMetaDissPlusOmitPersonSurnameIfEmpty()
// $refereeId = $referee->store();
$document->addPersonReferee($referee);
+ $editor = new Opus_Person();
+ $editor->setLastName('TestEditor');
+ $document->addPersonEditor($editor);
+
$this->docIds[] = $document->store();
$this->dispatch('/oai?verb=GetRecord&metadataPrefix=xMetaDissPlus&identifier=oai::' . $document->getId());
@@ -1815,15 +1819,22 @@ public function testXMetaDissPlusOmitPersonSurnameIfEmpty()
$this->assertEquals(1, $advisorName->length);
$advisorFirstName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="advisor"]/pc:person/pc:name/pc:foreName');
$this->assertEquals(0, $advisorFirstName->length);
- $advisorLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="advisor"]/pc:person/pc:name/pc:surName');
+ $advisorLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="advisor"]/pc:person/pc:name/pc:personEnteredUnderGivenName');
$this->assertEquals(1, $advisorLastName->length);
$refereeName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="referee"]/pc:person/pc:name');
$this->assertEquals(1, $refereeName->length);
$refereeFirstName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="referee"]/pc:person/pc:name/pc:foreName');
$this->assertEquals(0, $refereeFirstName->length);
- $refereeLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="referee"]/pc:person/pc:name/pc:surName');
+ $refereeLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="referee"]/pc:person/pc:name/pc:personEnteredUnderGivenName');
$this->assertEquals(1, $refereeLastName->length);
+
+ $editorName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="editor"]/pc:person/pc:name');
+ $this->assertEquals(1, $editorName->length);
+ $editorFirstName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="editor"]/pc:person/pc:name/pc:foreName');
+ $this->assertEquals(0, $editorFirstName->length);
+ $editorLastName = $xpath->query('//xMetaDiss:xMetaDiss/dc:contributor[@thesis:role="editor"]/pc:person/pc:name/pc:personEnteredUnderGivenName');
+ $this->assertEquals(1, $editorLastName->length);
}
/**
From 8fc76c8a759aa3a058f00f0dbb3bcb1f58576003 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Tue, 21 Sep 2021 15:27:55 +0200
Subject: [PATCH 04/14] OPUSVIER-4562 Do not overwrite PublishedDate when
publishing Only set PublishedDate when publishing documents using the
'review' module, if it has not been set already.
---
.../review/models/ClearDocumentsHelper.php | 10 ++--
.../models/ClearDocumentsHelperTest.php | 52 +++++++++++++++++--
2 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/modules/review/models/ClearDocumentsHelper.php b/modules/review/models/ClearDocumentsHelper.php
index 5e21114ae9..5ae6fc3c4a 100644
--- a/modules/review/models/ClearDocumentsHelper.php
+++ b/modules/review/models/ClearDocumentsHelper.php
@@ -28,9 +28,8 @@
* @package Module_Review
* @author Thoralf Klein
* @author Jens Schwidder
- * @copyright Copyright (c) 2008-2011, OPUS 4 development team
+ * @copyright Copyright (c) 2008-2021, OPUS 4 development team
* @license http://www.gnu.org/licenses/gpl.html General Public License
- * @version $Id$
*/
/**
@@ -60,7 +59,12 @@ public function clear(array $docIds = null, $userId = null, $person = null)
$date = new Opus_Date();
$date->setNow();
$document->setServerDatePublished($date);
- $document->setPublishedDate($date);
+
+ // Only set PublishedDate, if it is empty (the field is used in various ways)
+ $publishedDate = $document->getPublishedDate();
+ if ($publishedDate === null) {
+ $document->setPublishedDate($date);
+ }
$guestRole = Opus_UserRole::fetchByName('guest');
foreach ($document->getFile() as $file) {
diff --git a/tests/modules/review/models/ClearDocumentsHelperTest.php b/tests/modules/review/models/ClearDocumentsHelperTest.php
index e838559906..e671b92038 100644
--- a/tests/modules/review/models/ClearDocumentsHelperTest.php
+++ b/tests/modules/review/models/ClearDocumentsHelperTest.php
@@ -26,7 +26,7 @@
*
* @category Application Unit Tests
* @author Jens Schwidder
- * @copyright Copyright (c) 2008-2019, OPUS 4 development team
+ * @copyright Copyright (c) 2008-2021, OPUS 4 development team
* @license http://www.gnu.org/licenses/gpl.html General Public License
*/
@@ -74,8 +74,6 @@ public function testClearDocument()
public function testClearDocumentWithFile()
{
- $this->markTestIncomplete('TODO: Re-enable, as soon as OPUSVIER-1220 is fixed.');
-
$path = '/tmp/opus4-test/' . uniqid() . "/src";
mkdir($path, 0777, true);
@@ -158,4 +156,52 @@ public function testRejectDocumentWoPerson()
$this->assertEquals(1, count($enrichments));
$this->assertEquals(23, $enrichments[0]->getValue());
}
+
+ public function testPublishedDateIsSetIfEmpty()
+ {
+ $document = new Opus_Document($this->documentId);
+ $this->assertNull($document->getPublishedDate());
+
+ $helper = new Review_Model_ClearDocumentsHelper();
+ $helper->clear([$this->documentId], 23, $this->person);
+
+ $document = new Opus_Document($this->documentId);
+ $this->assertEquals('published', $document->getServerState());
+ $this->assertEquals(1, count($document->getPersonReferee()));
+
+ $publishedDate = $document->getPublishedDate();
+
+ $this->assertNotNull($publishedDate);
+
+ $today = new DateTime('today');
+ $publishedDateTime = $publishedDate->getDateTime($today->getTimezone()->getName());
+ $publishedDateTime->setTime(0, 0, 0);
+
+ $this->assertEquals(0, (integer)$today->diff($publishedDateTime)->format('%R%a'));
+ }
+
+ public function testPublishedDateIsNotOverwritten()
+ {
+ // set PublishedDate to yesterday
+ $document = new Opus_Document($this->documentId);
+ $yesterday = new DateTime('yesterday');
+ $expectedDate = new Opus_Date($yesterday);
+ $document->setPublishedDate($expectedDate);
+ $document->store();
+
+ $helper = new Review_Model_ClearDocumentsHelper();
+ $helper->clear([$this->documentId], 23, $this->person);
+
+ $document = new Opus_Document($this->documentId);
+ $this->assertEquals('published', $document->getServerState());
+ $this->assertEquals(1, count($document->getPersonReferee()));
+
+ $publishedDate = $document->getPublishedDate();
+ $publishedDate->setHour(0);
+ $publishedDate->setMinute(0);
+ $publishedDate->setSecond(0);
+
+ $this->assertNotNull($publishedDate);
+ $this->assertEquals(0, $expectedDate->compare($publishedDate)); // still yesterday
+ }
}
From cd7a3102672b727eea9e6f7bcb04f8f476ba34f1 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Tue, 21 Sep 2021 16:44:12 +0200
Subject: [PATCH 05/14] #418 Use Ubuntu 20.04 for testing Still using PHP 7.1
because of Zend Framework 1
---
.github/workflows/php.yml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 30fc822c66..b0d1164135 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,17 +1,23 @@
name: PHP Composer
-on: [push]
+on:
+ push:
+
+ schedule:
+ - cron: '20 3 * * *'
jobs:
build:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- - name: Change to PHP7.0
- run: sudo update-alternatives --set php /usr/bin/php7.0
+ - name: Setup PHP 7.1
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: '7.1'
- name: Install Composer and Dependencies
run: sudo apt-get update && curl -s http://getcomposer.org/installer | php && php composer.phar self-update && php composer.phar install
From 19c307f6eb77ab0078f84d4219d064f791e41fa1 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Tue, 18 May 2021 10:53:36 +0200
Subject: [PATCH 06/14] OPUSVIER-4550 Fixed creating DB users
---
bin/install-database.sh | 6 ++++--
bin/install_mysql_docker.sh | 2 +-
build.xml | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bin/install-database.sh b/bin/install-database.sh
index 964dc34eb3..299ee31859 100755
--- a/bin/install-database.sh
+++ b/bin/install-database.sh
@@ -176,8 +176,10 @@ mysqlRoot() {
mysqlRoot < have to be in one line
export MYSQL_PWD=root \
- && mysql --default-character-set=utf8 -h 'localhost' -P '3306' -u 'root' -v -e "CREATE DATABASE IF NOT EXISTS opusdb DEFAULT CHARACTER SET = UTF8 DEFAULT COLLATE = UTF8_GENERAL_CI; GRANT ALL PRIVILEGES ON opusdb.* TO 'opus4'@'localhost' IDENTIFIED BY 'root'; GRANT SELECT,INSERT,UPDATE,DELETE ON opusdb.* TO 'opus4admin'@'localhost' IDENTIFIED BY 'root'; FLUSH PRIVILEGES;"
+ && mysql --default-character-set=utf8 -h 'localhost' -P '3306' -u 'root' -v -e "CREATE DATABASE IF NOT EXISTS opusdb DEFAULT CHARACTER SET = UTF8 DEFAULT COLLATE = UTF8_GENERAL_CI; CREATE USER 'opus4admin'@'localhost' IDENTIFIED BY 'root'; GRANT ALL PRIVILEGES ON opusdb.* TO 'opus4admin'@'localhost'; CREATE USER 'opus4'@'localhost' IDENTIFIED BY 'root'; GRANT SELECT,INSERT,UPDATE,DELETE ON opusdb.* TO 'opus4'@'localhost'; FLUSH PRIVILEGES;"
diff --git a/build.xml b/build.xml
index 4281dd2bbe..09159e119d 100644
--- a/build.xml
+++ b/build.xml
@@ -12,9 +12,9 @@
-
+
-
+
From b7c433530db6bd0a9407551c136887607c150376 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 11:52:37 +0200
Subject: [PATCH 07/14] #418 Fixing translation unit tests
---
tests/library/Application/Form/Element/PositionTest.php | 2 ++
tests/library/Application/View/Helper/FormTranslationTest.php | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/library/Application/Form/Element/PositionTest.php b/tests/library/Application/Form/Element/PositionTest.php
index c0c5281042..89cba7c0f6 100644
--- a/tests/library/Application/Form/Element/PositionTest.php
+++ b/tests/library/Application/Form/Element/PositionTest.php
@@ -44,6 +44,8 @@ public function setUp()
];
$this->_staticViewHelper = 'viewFormSelect';
parent::setUp();
+
+ $this->useEnglish();
}
public function testOptions()
diff --git a/tests/library/Application/View/Helper/FormTranslationTest.php b/tests/library/Application/View/Helper/FormTranslationTest.php
index 5dd88df6f5..658d18aff4 100644
--- a/tests/library/Application/View/Helper/FormTranslationTest.php
+++ b/tests/library/Application/View/Helper/FormTranslationTest.php
@@ -30,7 +30,7 @@
* @copyright Copyright (c) 2019, OPUS 4 development team
* @license http://www.gnu.org/licenses/gpl.html General Public License
*/
-class Application_View_Helper_Form_TranslationTest extends ControllerTestCase
+class Application_View_Helper_FormTranslationTest extends ControllerTestCase
{
protected $additionalResources = ['view', 'translation'];
@@ -47,6 +47,8 @@ public function testRenderingMinimal()
public function testRenderingOptions()
{
+ $this->useEnglish();
+
$helper = new Application_View_Helper_FormTranslation();
$helper->setView(Zend_Registry::get('Opus_View'));
From df1422588a3c53be696a65ce6a96c21a05fff471 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 12:03:30 +0200
Subject: [PATCH 08/14] #418 Fixing translation unit tests
---
tests/library/Application/View/Helper/ResultTitleTest.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/library/Application/View/Helper/ResultTitleTest.php b/tests/library/Application/View/Helper/ResultTitleTest.php
index b235452575..d7df60e627 100644
--- a/tests/library/Application/View/Helper/ResultTitleTest.php
+++ b/tests/library/Application/View/Helper/ResultTitleTest.php
@@ -45,6 +45,8 @@ public function setUp()
$this->helper = new Application_View_Helper_ResultTitle();
$view = Zend_Registry::get('Opus_View');
$this->helper->setView($view);
+
+ $this->useEnglish();
}
public function testRendering()
From c139ab78285b16edb448d07030c34919ec3bb0c8 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 12:33:38 +0200
Subject: [PATCH 09/14] #418 Fixing translation in unit tests
---
tests/library/Application/View/Helper/ResultTitleTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/library/Application/View/Helper/ResultTitleTest.php b/tests/library/Application/View/Helper/ResultTitleTest.php
index d7df60e627..8579350f21 100644
--- a/tests/library/Application/View/Helper/ResultTitleTest.php
+++ b/tests/library/Application/View/Helper/ResultTitleTest.php
@@ -34,7 +34,7 @@
class Application_View_Helper_ResultTitleTest extends ControllerTestCase
{
- protected $additionalResources = ['database', 'view'];
+ protected $additionalResources = ['database', 'view', 'translation'];
protected $helper;
From a4a8013b96d05c5fd31fea5243fac5dc39785580 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 13:48:35 +0200
Subject: [PATCH 10/14] #418 Trying to analyse test problems
---
tests/modules/export/DataCiteExportTest.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/modules/export/DataCiteExportTest.php b/tests/modules/export/DataCiteExportTest.php
index e9f3e7ef42..b07e3e7731 100644
--- a/tests/modules/export/DataCiteExportTest.php
+++ b/tests/modules/export/DataCiteExportTest.php
@@ -301,6 +301,10 @@ public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForNonAdminUserW
$this->removeModuleAccess('export', 'docsadmin');
}
+ $doc = new Opus_Document($docId);
+ var_dump(APPLICATION_ENV);
+ var_dump($doc->getIdentifier());
+
$this->assertResponseCode(200);
$this->assertContains("DataCite XML of document ${docId} is not valid", $this->getResponse()->getBody());
}
From 75be5e78beebf1fb4696b3b3bdffde57c397df89 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 14:31:15 +0200
Subject: [PATCH 11/14] #418 Fix language used for tests
---
tests/modules/export/DataCiteExportTest.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/modules/export/DataCiteExportTest.php b/tests/modules/export/DataCiteExportTest.php
index b07e3e7731..59a9261008 100644
--- a/tests/modules/export/DataCiteExportTest.php
+++ b/tests/modules/export/DataCiteExportTest.php
@@ -270,6 +270,8 @@ public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForAdmin()
public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForNonAdminUserWithPermission()
{
+ $this->useEnglish();
+
$removeAccess = $this->addModuleAccess('export', 'docsadmin');
$this->enableSecurity();
$config = Zend_Registry::get('Zend_Config');
@@ -301,16 +303,14 @@ public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForNonAdminUserW
$this->removeModuleAccess('export', 'docsadmin');
}
- $doc = new Opus_Document($docId);
- var_dump(APPLICATION_ENV);
- var_dump($doc->getIdentifier());
-
$this->assertResponseCode(200);
$this->assertContains("DataCite XML of document ${docId} is not valid", $this->getResponse()->getBody());
}
public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForNonAdminUserWithoutPermission()
{
+ $this->useEnglish();
+
$removeAccess = $this->addModuleAccess('export', 'collectionsadmin');
$this->enableSecurity();
$config = Zend_Registry::get('Zend_Config');
From e65d88e5a30646b084bcacce25c7a569d0654ae6 Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 15:27:39 +0200
Subject: [PATCH 12/14] #418 Fix language used for tests
---
tests/modules/export/DataCiteExportTest.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/modules/export/DataCiteExportTest.php b/tests/modules/export/DataCiteExportTest.php
index 59a9261008..943f5d830e 100644
--- a/tests/modules/export/DataCiteExportTest.php
+++ b/tests/modules/export/DataCiteExportTest.php
@@ -237,6 +237,8 @@ public function testExportOfDataCiteXmlWithUnpublishedDocNotAllowed()
public function testExportOfDataCiteXmlWithUnpublishedDocAllowedForAdmin()
{
+ $this->useEnglish();
+
$this->enableSecurity();
$config = Zend_Registry::get('Zend_Config');
From 004be77e75cedef4354a7f16e98958c149a1f62a Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Mon, 27 Sep 2021 16:25:07 +0200
Subject: [PATCH 13/14] #418 Fix language used for tests
---
tests/modules/admin/forms/Document/SubjectTypeTest.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/modules/admin/forms/Document/SubjectTypeTest.php b/tests/modules/admin/forms/Document/SubjectTypeTest.php
index f3787e94c0..4747753c51 100644
--- a/tests/modules/admin/forms/Document/SubjectTypeTest.php
+++ b/tests/modules/admin/forms/Document/SubjectTypeTest.php
@@ -40,6 +40,8 @@ class Admin_Form_Document_SubjectTypeTest extends ControllerTestCase
public function testCreateForm()
{
+ $this->useEnglish();
+
$form = new Admin_Form_Document_SubjectType('swd');
$this->assertEquals(0, count($form->getSubForms()));
From 4a6cea423c28236e31550db654bbe91af265c80f Mon Sep 17 00:00:00 2001
From: j3nsch
Date: Tue, 28 Sep 2021 17:46:50 +0200
Subject: [PATCH 14/14] OPUSVIER-4564 Release preparations
---
CHANGES.md | 15 +++++++++++++++
RELEASE_NOTES.md | 15 ++++++++++++++-
application/configs/application.ini | 2 +-
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index bedd40684f..e8305e3f87 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,21 @@
---
+## Release 4.7.0.6 - 2021-09-28
+
+### Bugs
+
+* [OPUSVIER-4562] - "Freischalten" überschreibt "PublishedDate" mit aktuellem Datum
+* [OPUSVIER-3981] - Persönlicher Name eines Verfassers ist in XMetaDissPlus bisher nicht möglich
+* [#420] - Fehler bei XMetaDissPlus-Ausgabe bei Personen ohne Vornamen
+* [#424] - Tests, die von UI-Sprache abhängen fixen
+
+### Aufgaben
+
+* [#418] - Automatische Tests mit GitHub Actions auf Ubuntu 20 umstellen
+
+---
+
## Release 4.7.0.5 - 2021-08-17
### Bugs
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index bbacc5ce98..6329104813 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,11 @@
# OPUS 4 Release Notes
-## Release 4.7.0.6 2021-09-21
+## Release 4.7.0.6 2021-09-28
+
+Dieser Patch Release behebt Problem bei XMetaDissPlus und beim
+Freischalten von Dokumenten im Review-Modul.
+
+### Personen ohne Vornamen in XMetaDissPlus
AutorInnen ohne Vornamen werden in XMetaDissPlus nun mit dem Element
`pc:personEnteredUnderGivenName` abgebildet. Der Nachname kann damit
@@ -14,6 +19,14 @@ auch für Künstlernamen verwendet werden, die keinen Vornamen haben.
```
+### `PublishedDate` beim Freischalten von Dokumenten
+
+Beim Freischalten von Dokumenten im Review-Modul, also nicht beim
+Freischalten eines einzelnen Dokuments in der Administration, wurde
+bisher immer das Feld `PublishedDate` auf das aktuelle Datum gesetzt.
+Mit der neuen Version werden existierende Einträge in dem Feld nicht
+mehr überschrieben.
+
## Release 4.7.0.5 2021-08-17
Dieser Patch Release behebt zwei kleinere Bugs. Das Editieren der Inhalte der
diff --git a/application/configs/application.ini b/application/configs/application.ini
index cb82edf438..7cc84088ea 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -77,7 +77,7 @@ name = 'OPUS 4'
logoLink = home
security = 1
workspacePath = APPLICATION_PATH "/workspace"
-version = 4.7.0.5
+version = 4.7.0.6
update.latestVersionCheckUrl = "https://api.github.com/repos/opus4/application/releases/latest"
; base URL of your OPUS instance (used for generating absolute URLs, e.g. in email messages)
url = 'https://web.example.org/opus'