diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c846bce595..3644b298ae 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -25,6 +25,9 @@ jobs: - 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 + - name: Fix for issue 502 + run: sudo apt-get --fix-broken install + - name: Install additional Software run: sudo apt-get install libxml2-utils diff --git a/CHANGES.md b/CHANGES.md index 67ba5298e5..2fef388460 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,11 +1,25 @@ # OPUS 4 Change Log +## Release 4.7.0.8 - 2022-01-25 + +### Aufgaben + +* GH-485 PUBMED URL aktualisiert und konfigurierbar gemacht +* GH-482 Components Installer Plugin für Composer 2 aktualisiert + +### Development Tools + +* GH-502 Fixed build problem on GitHub + +--- + ## Release 4.7.0.7 - 2021-10-19 ### Bugs * [OPUSVIER-4563] - OAI-PMH: Deklaration von xmlns:xsi XMLSchema-instance fehlt auf Folgeseiten * GH-377 - Nach erfolgreicher Änderung eines Passworts erscheint Fehlermeldung und keine Bestätigungsmeldung + --- ## Release 4.7.0.6 - 2021-09-28 diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 08c7ced18e..72e4ee89d4 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -2,6 +2,25 @@ --- +## Patch Release 4.7.0.8 2022-01-25 + +Die Resolver-URL für PUBMED Einträge wurde aktualisiert und konfigurierbar gemacht, +damit sie in Zukunft leichter ausgetauscht werden kann. + +``` +pubmed.baseUrl = https://pubmed.ncbi.nlm.nih.gov/ +``` + +Die Installation von Components, JQuery und JQuery-UI, mit Composer 2 wurde gefixt, +indem auf ein aktuelles Installer-Plugin umgestiegen wurde. Bei existierenden +Instanzen kann es während der Ausführungen von `composer update` zu Fehlermeldungen +über fehlende Klassen kommen. Ein nochmaliges ausführen von `composer update` behebt +in der Regel das Problem. Im Zweifelsfall können die Verzeichnisse `vendor` und auch +`public/assets` gelöscht werden, um dann sämtliche Pakete und auch die Komponenten +mit `composer install` frisch zu installieren. + +--- + ## Patch Release 4.7.0.7 2021-10-19 Die Deklaration des Namespaces "xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/application/configs/application.ini b/application/configs/application.ini index cfb584a890..7dce75ffb8 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.7 +version = 4.7.0.8 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' @@ -407,6 +407,9 @@ googleScholar.openInNewWindow = 0 ; Twitter Settings twitter.openInNewWindow = 0 +; PubMed Settings +pubmed.baseUrl = https://pubmed.ncbi.nlm.nih.gov/ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; ; ; SWORD related configuration settings ; diff --git a/composer.json b/composer.json index 98fa4ccbc0..7a68d33c8d 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "opus4-repo/opus4-bibtex": "0.1-beta", "components/jquery": "3.4.*", "components/jqueryui": "1.12.*", - "robloach/component-installer": "*" + "oomphinc/composer-installers-extender": "^2.0" }, "require-dev": { "phpunit/phpunit": "4.8.*", @@ -42,8 +42,11 @@ }, "minimum-stability": "dev", "prefer-stable": true, - "config": { - "component-dir": "public/assets" + "extra": { + "installer-types": ["component"], + "installer-paths": { + "public/assets/{$name}": ["type:component"] + } }, "scripts": { "analysis": [ diff --git a/modules/export/views/scripts/publist/default.xslt b/modules/export/views/scripts/publist/default.xslt index e27a420139..0cc1d29c8f 100644 --- a/modules/export/views/scripts/publist/default.xslt +++ b/modules/export/views/scripts/publist/default.xslt @@ -572,7 +572,7 @@ - http://www.ncbi.nlm.nih.gov/pubmed/ + PMID diff --git a/modules/frontdoor/views/scripts/index/templates/metadata.xslt b/modules/frontdoor/views/scripts/index/templates/metadata.xslt index 49400007ca..b6328e96f6 100644 --- a/modules/frontdoor/views/scripts/index/templates/metadata.xslt +++ b/modules/frontdoor/views/scripts/index/templates/metadata.xslt @@ -364,10 +364,10 @@ - http://www.ncbi.nlm.nih.gov/pubmed?term= + - http://www.ncbi.nlm.nih.gov/pubmed?term= + diff --git a/tests/modules/export/controllers/IndexControllerTest.php b/tests/modules/export/controllers/IndexControllerTest.php index 709dcb2bc6..71d43a786e 100644 --- a/tests/modules/export/controllers/IndexControllerTest.php +++ b/tests/modules/export/controllers/IndexControllerTest.php @@ -1014,4 +1014,13 @@ private function removeAccessOnModuleExportForGuest() { return $this->removeModuleAccess('export', 'guest'); } + + public function testPublistPubmedRendering() + { + $this->dispatch('/export/index/publist/role/publists/number/coll_visible'); + + $this->assertResponseCode(200); + + $this->markTestIncomplete('Setup collection for publist including document with pubmed-id'); + } } diff --git a/tests/modules/frontdoor/controllers/IndexControllerTest.php b/tests/modules/frontdoor/controllers/IndexControllerTest.php index d3a3b390c4..7d15cd9394 100644 --- a/tests/modules/frontdoor/controllers/IndexControllerTest.php +++ b/tests/modules/frontdoor/controllers/IndexControllerTest.php @@ -1545,4 +1545,18 @@ public function testDuplicateDocIdParameter() $this->assertXpathContentContains('//h2[@class="titlemain"]', 'KOBV'); $this->assertNotXpathContentContains('//h2[@class="titlemain"]', 'Sonderzeichen'); } + + public function testPubmedRendering() + { + $this->dispatch('/frontdoor/index/index/docId/146'); + + $path = 'table.result-data.frontdoordata th.name'; + + $config = $this->getConfig(); + + $pubmedUrl = $config->pubmed->baseUrl . '123'; + + $this->assertQueryContentContains('table.result-data.frontdoordata td', $pubmedUrl); + $this->assertXpath("//table/tr/td/a[@href=\"$pubmedUrl\"]"); + } }