Merge pull request #349 from OPUS4/4.7.0.2

Applying 4.7.0.2 patches to master

CHANGES.md

@@ -2,14 +2,15 @@
 
 --- 
 
-## Patches for 4.7 - 2020-08-27
-
-### Aufgaben
+## Patches for 4.7 - 2020-09-04
 
-* [OPUSVIER-4293] - Login-Status in XSLT abfragen
+* [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
 
-### 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
 
 ---

README.md

@@ -7,59 +7,46 @@ 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.
 
 [Developers][DEVDOC]
 : Information for developers.
 
-## OPUS 4 at GitHub
+## Questions & Issues
+
+Questions should be asked through the [OPUS 4 mailing list][OPUSTESTER]. We are sending out release announcements and 
+other information using the mailing list. 
 
-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.
+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.  
 
-## Previous (non-GitHub) 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.    
 
-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. 
+## More Information
 
-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.
+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://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
+[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

modules/frontdoor/views/scripts/index/pagination.phtml

@@ -27,9 +27,8 @@
  * @category    Application
  * @package     Module_Frontdoor
  * @author      Edouard Simon <e.simon@aufzuneuenseiten.de>
- * @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 @@
        ])
         ?>"><?= $this->translate('back_to_result_list') ?></a>
 
-
-
 </div>

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)) {

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;
 ?>
 
 <div class="result_box <?= $this->partialCounter % 2 === 0 ? 'even' : 'odd'; ?> <?= $document->getServerState() ?>">

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);
+    }
 }