From 7c95b9b05e4abacea1fd02eaa31f7ce23526e770 Mon Sep 17 00:00:00 2001 From: j3nsch Date: Tue, 1 Sep 2020 19:17:14 +0200 Subject: [PATCH 1/7] OPUSVIER-4314 Fixed frontdoor pagination. --- modules/frontdoor/views/scripts/index/pagination.phtml | 5 +---- modules/solrsearch/views/scripts/index/result.phtml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/frontdoor/views/scripts/index/pagination.phtml b/modules/frontdoor/views/scripts/index/pagination.phtml index a375d7ef7..df5730267 100644 --- a/modules/frontdoor/views/scripts/index/pagination.phtml +++ b/modules/frontdoor/views/scripts/index/pagination.phtml @@ -27,9 +27,8 @@ * @category Application * @package Module_Frontdoor * @author Edouard Simon - * @copyright Copyright (c) 2015, OPUS 4 development team + * @copyright Copyright (c) 2015-2020, OPUS 4 development team * @license http://www.gnu.org/licenses/gpl.html General Public License - * @version $Id$ */ ?> @@ -81,6 +80,4 @@ ]) ?>">translate('back_to_result_list') ?> - - diff --git a/modules/solrsearch/views/scripts/index/result.phtml b/modules/solrsearch/views/scripts/index/result.phtml index 9bc9b3e97..0d74dd1d1 100644 --- a/modules/solrsearch/views/scripts/index/result.phtml +++ b/modules/solrsearch/views/scripts/index/result.phtml @@ -39,6 +39,8 @@ $result = $this->result; $document = $result->getDocument(); $view = Zend_Registry::get('Opus_View'); // TODO it is a bad hack to access variables in parent view $seriesId = $view->seriesId; +$this->start = $view->start; +$this->rows = $view->rows; ?>
From 13e6c2c846a391fc706d863b15e6036b0d5268b3 Mon Sep 17 00:00:00 2001 From: j3nsch Date: Tue, 1 Sep 2020 19:43:50 +0200 Subject: [PATCH 2/7] OPUSVIER-4314 Added unit test for pagination parameters. --- .../solrsearch/controllers/IndexControllerTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/modules/solrsearch/controllers/IndexControllerTest.php b/tests/modules/solrsearch/controllers/IndexControllerTest.php index 7ebd265bc..4b92246a0 100644 --- a/tests/modules/solrsearch/controllers/IndexControllerTest.php +++ b/tests/modules/solrsearch/controllers/IndexControllerTest.php @@ -1407,4 +1407,13 @@ public function testFilteringByYearWithInvertedYearFacetConfigured() { $this->markTestIncomplete(); } + + public function testPaginationParametersArePresentInFrontdoorLinks() + { + $this->dispatch('/solrsearch/index/search/searchtype/latest'); + + $this->assertXpathCount('//div[@class="results_title"]/a', 10); + $this->assertXpath('//div[@class="results_title"]/a[contains(@href, "start") and contains(@href, "rows/10")]'); + $this->assertXpathCount('//div[@class="results_title"]/a[contains(@href, "start") and contains(@href, "rows/10")]', 10); + } } From 487726c72ffd464323e4f57fcf8aee25f6c49ff0 Mon Sep 17 00:00:00 2001 From: alw-bsz <49676210+alw-bsz@users.noreply.github.com> Date: Wed, 2 Sep 2020 17:55:35 +0200 Subject: [PATCH 3/7] Fixing bug in setting collection id Fixes bug https://tickets.zib.de/jira/browse/OPUSVIER-3566 --- modules/publish/models/FormElement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/publish/models/FormElement.php b/modules/publish/models/FormElement.php index a522eb804..e4f353555 100644 --- a/modules/publish/models/FormElement.php +++ b/modules/publish/models/FormElement.php @@ -571,7 +571,7 @@ public function getCollectionRole() public function setCurrentCollectionId($setRoot = false) { if (! $setRoot) { - $collectionRole = Opus_CollectionRole::fetchByOaiName($this->_collectionRole); + $collectionRole = Opus_CollectionRole::fetchByName($this->_collectionRole); if (! is_null($collectionRole)) { $rootCollection = $collectionRole->getRootCollection(); if (! is_null($rootCollection)) { From b2c5a9425a10cb22741710d25a0c2792da0e664a Mon Sep 17 00:00:00 2001 From: j3nsch Date: Thu, 3 Sep 2020 10:10:22 +0200 Subject: [PATCH 4/7] OPUSVIER-4305 Updated CHANGES and README --- CHANGES.md | 10 +++++----- README.md | 56 ++++++++++++++++-------------------------------------- 2 files changed, 21 insertions(+), 45 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fa085bfad..3f6b7e007 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,14 +2,14 @@ --- -## Patches for 4.7 - 2020-08-27 - -### Aufgaben +## Patches for 4.7 - 2020-09-08 -* [OPUSVIER-4293] - Login-Status in XSLT abfragen +* [OPUSVIER-4314] - Pagination-Link-Hitlist Leiste fehlt +* [OPUSVIER-4305] - GitHub Info für OPUS 4 Application aktualisieren -### Bugs +## Patches for 4.7 - 2020-08-27 +* [OPUSVIER-4293] - Login-Status in XSLT abfragen * [OPUSVIER-4304] - Inhalte der angepassten Leitlinien / Policies werden beim Update auf OPUS 4.7 nicht importiert --- diff --git a/README.md b/README.md index 7947cbf9c..477768267 100644 --- a/README.md +++ b/README.md @@ -7,27 +7,9 @@ redevelopment that was created as part of a DFG ([Deutsche Forschungsgemeinschaf Since then the development has been continued at KOBV ([Kooperativer Bibliotheksverbund Berlin-Brandenburg][KOBV]) mostly. -## OPUS 4.7-RC (Release Candidate) +## OPUS 4.7 (current version) -The release candidate should be used to test updating OPUS 4 instances and giving feedback to the developers -[here][ISSUES] or using the OPUS 4 [tester mailing list][OPUSTESTER]. Thank you very much! - -The release candidate is available on the [4.7-RC][BRANCH47RC] branch. - -Depending on the level of customization of your instance the update might require some work. A lot of files were -changed and the list of new features and modifications is long. - -We are still working on a number of issues before we can release the final version of OPUS 4.7. Here some of the -most important points. - -- Configuration of search facettes for enrichments -- Translation management in Setup area of administration -- Update issues (?) -- Documentation is outdated and needs to be updated (especially customizing translations) - -## Current Version - OPUS 4.6.3 - -The current version of OPUS 4 is 4.6.3. It is available on the [master][MASTER] branch. +The current version of OPUS 4 is 4.7. It is available on the [master][MASTER] branch. [Documentation][DOC] : Information on setting up a repository, for users and administrators. @@ -35,31 +17,25 @@ The current version of OPUS 4 is 4.6.3. It is available on the [master][MASTER] [Developers][DEVDOC] : Information for developers. -## OPUS 4 at GitHub - -In 2015 the development was moved to GitHub in order to better support collaboration in the continued development -efforts. The first OPUS 4 version developed at GitHub is 4.5. Starting with this version OPUS 4 should be installed -using Git, since this will make updates for bug fixes and new features easier. More information can be found online. +## Questions & Issues -## Previous (non-GitHub) Version: +Questions should be asked through the [OPUS 4 mailing list][OPUSTESTER]. We are sending out release announcements and +other information using the mailing list. -The last non-Git release of OPUS 4 is Version 4.4.5 and can be [downloaded][OPUS445] from the -[OPUS 4 Homepage][OPUS4] as a tarball. The [documentation][OPUS445DOC] for this version can -be found there as well. This version is no longer supported. +Bugs and suggestions can be communicated to the development team as [issues][ISSUES] here on GitHub. For suggestions +of new features or changes in OPUS 4 it is important to communicate the reason from a user perspective, the use case. +We need to understand *why* to make the best decision for *how* to implement something new. -Version 4.4.5 can be installed without Git. It is recommended to use the GitHub version of -OPUS 4 for setting up new repositories. However if you are looking at migrating an existing OPUS 3 -repository to OPUS 4 using this version would currently be a necessary step since there is at the moment -no working migration script for the Git version. +If you have made modifications to OPUS 4 that could be useful for the entire community feel free to submit a [pull +request][PULLREQUESTS]. We won't always be able to respond immediately, but we will take a look at your changes. +It is important to communicate the idea behind a modification. -[OPUS4]: https://opus4.kobv.de -[DEVDOC]: https://opus4.github.io/ -[DOC]: https://opus4.github.io/userdoc +[OPUS4]: https://www.kobv.de/entwicklung/software/opus-4/ +[DEVDOC]: https://www.opus-repository.org +[DOC]: https://www.opus-repository.org/userdoc [KOBV]: https://www.kobv.de [DFG]: http://www.dfg.de -[OPUS445]: https://www.kobv.de/entwicklung/software/opus-4/download/ -[OPUS445DOC]: https://www.kobv.de/entwicklung/software/opus-4/dokumentation/ [OPUSTESTER]: http://listserv.zib.de/mailman/listinfo/kobv-opus-tester/ [ISSUES]: http://github.com/OPUS4/application/issues -[BRANCH47RC]: https://github.com/OPUS4/application/tree/4.7-RC -[MASTER]: https://github.com/OPUS4/application/tree/master \ No newline at end of file +[MASTER]: https://github.com/OPUS4/application/tree/master +[PULLREQUESTS]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests From 24eadbc2b75f2eca7248003fe1df30dab28548c7 Mon Sep 17 00:00:00 2001 From: j3nsch Date: Thu, 3 Sep 2020 10:25:02 +0200 Subject: [PATCH 5/7] OPUSVIER-4305 About milestones and projects --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 477768267..34fe22105 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,15 @@ If you have made modifications to OPUS 4 that could be useful for the entire com request][PULLREQUESTS]. We won't always be able to respond immediately, but we will take a look at your changes. It is important to communicate the idea behind a modification. +## More Information + +Currently, we are using an internal Jira-System at KOBV to manage the tasks for the OPUS 4 development. We are starting +to use GitHub more and more to communicate the development goals and progress. +At the moment, the [milestones][MILESTONES] here on GitHub mostly reflect larger technical debts that need to be fixed +in order to continue to expand the functionality of OPUS 4 in the future. The [projects][PROJECTS] are meant to show +currently ongoing efforts. However, we are still experimenting and trying to figure out how to use the GitHub features +in the best possible way without it taking too much time away from the developing work. + [OPUS4]: https://www.kobv.de/entwicklung/software/opus-4/ [DEVDOC]: https://www.opus-repository.org [DOC]: https://www.opus-repository.org/userdoc @@ -39,3 +48,5 @@ It is important to communicate the idea behind a modification. [ISSUES]: http://github.com/OPUS4/application/issues [MASTER]: https://github.com/OPUS4/application/tree/master [PULLREQUESTS]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests +[MILESTONES]: https://github.com/OPUS4/application/milestones +[PROJECTS]: https://github.com/OPUS4/application/projects From 9c71c553732e473d6bfc698e163b0531980fb2bb Mon Sep 17 00:00:00 2001 From: j3nsch Date: Thu, 3 Sep 2020 12:30:54 +0200 Subject: [PATCH 6/7] OPUSVIER-4305 Added ticket to CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 3f6b7e007..39d048bf4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ * [OPUSVIER-4314] - Pagination-Link-Hitlist Leiste fehlt * [OPUSVIER-4305] - GitHub Info für OPUS 4 Application aktualisieren +* [OPUSVIER-3566] - Unterschied in "Name der Sammlung" und "Bezeichnung des OAI-Sets" führen zu Fehlern beim Veröffentlichen ## Patches for 4.7 - 2020-08-27 From ecf44e88f4c295142d4cdddc689ece22fcd4f329 Mon Sep 17 00:00:00 2001 From: Jens Schwidder Date: Fri, 4 Sep 2020 13:50:34 +0200 Subject: [PATCH 7/7] OPUSVIER-4305 Changed date for patch release --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 39d048bf4..fe1c6d42c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ --- -## Patches for 4.7 - 2020-09-08 +## Patches for 4.7 - 2020-09-04 * [OPUSVIER-4314] - Pagination-Link-Hitlist Leiste fehlt * [OPUSVIER-4305] - GitHub Info für OPUS 4 Application aktualisieren