Another try to fix scrutinizer

This commit is contained in:
Alexander Bigga 2021-11-27 21:23:16 +01:00
parent 94082ffcfb
commit 57c4aba9ab
4 changed files with 28 additions and 32 deletions

View File

@ -301,25 +301,14 @@ class NewTenantController extends AbstractController
}
$solrCore = $this->solrCoreRepository->findByPid($this->pid);
$solrCore2 = $this->solrCoreRepository->findByPid(0);
if (count($solrCore) > 0 or count($solrCore2) > 0) {
if (count($solrCore) > 0) {
// Fine.
$this->addFlashMessage(
$this->getLanguageService()->getLL('flash.solrcoreOkayMsg'),
$this->getLanguageService()->getLL('flash.solrcoreOkay'),
\TYPO3\CMS\Core\Messaging\FlashMessage::OK
);
} else {
// Default core available, but this is deprecated.
$this->addFlashMessage(
$this->getLanguageService()->getLL('flash.solrcoreDeprecatedMsg'),
$this->getLanguageService()->getLL('flash.solrcoreDeprecatedOkay'),
\TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE
);
$this->view->assign('solr', 1);
}
if ($solrCore) {
// Fine.
$this->addFlashMessage(
$this->getLanguageService()->getLL('flash.solrcoreOkayMsg'),
$this->getLanguageService()->getLL('flash.solrcoreOkay'),
\TYPO3\CMS\Core\Messaging\FlashMessage::OK
);
} else {
// Solr core missing.
$this->addFlashMessage(

View File

@ -14,6 +14,11 @@ namespace Kitodo\Dlf\Domain\Model;
class Document extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
{
/**
* @var int
*/
protected $pid;
/**
* @var \DateTime
*/
@ -179,6 +184,22 @@ class Document extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
*/
protected $documentFormat;
/**
* @return string
*/
public function getPid(): int
{
return $this->pid;
}
/**
* @param string $pid
*/
public function setPid(int $pid): void
{
$this->pid = $pid;
}
/**
* @return string
*/

View File

@ -653,14 +653,6 @@
<source><![CDATA[There are configuration records for Solr cores. They can be edited in the list module.]]></source>
<target><![CDATA[Es wurde die Konfiguration für einen Solr Kern gefunden. Über das Listenmodul können neue Datensätze hinzugefügt und die vorhandenen editiert werden.]]></target>
</trans-unit>
<trans-unit id="flash.solrcoreDeprecated" approved="yes">
<source><![CDATA[Deprecated configuration found!]]></source>
<target><![CDATA[Veraltete Konfiguration gefunden!]]></target>
</trans-unit>
<trans-unit id="flash.solrcoreDeprecatedMsg" approved="yes">
<source><![CDATA[A common Solr core was found in the root-page. This is deprecated since Kitodo.Presentation 1.1. Solr cores should be stored in the client's SysFolder instead. Move a Solr core to this SysFolder (manually) or create a new one automatically.&lt;br /&gt;&lt;br /&gt;&lt;a href="%s"&gt;Create new Solr core!&lt;/a&gt;]]></source>
<target><![CDATA[Es wurde ein allgemeiner Solr Kern in der Root-Page gefunden. Das entspricht dem Verhalten von Kitodo.Presentation 1.0. Seit Version 1.1 sollten Solr Kerne im SysOrdner des jeweiligen Mandanten konfiguriert werden. Es sollte entweder einer der Solr Kerne aus der Root-Page in diesen SysOrdner verschoben werden (manuell) oder ein neuer Solr Kern angelegt werden.&lt;br /&gt;&lt;br /&gt;&lt;a href="%s"&gt;Neuen Solr Kern jetzt anlegen!&lt;/a&gt;]]></target>
</trans-unit>
<trans-unit id="flash.solrcoreMissing" approved="yes">
<source><![CDATA[No Solr core found!]]></source>
<target><![CDATA[Kein Solr Kern gefunden!]]></target>

View File

@ -503,12 +503,6 @@
<trans-unit id="flash.solrcoreOkayMsg" approved="yes">
<source><![CDATA[There are configuration records for Solr cores. They can be edited in the list module.]]></source>
</trans-unit>
<trans-unit id="flash.solrcoreDeprecated" approved="yes">
<source><![CDATA[Deprecated configuration found!]]></source>
</trans-unit>
<trans-unit id="flash.solrcoreDeprecatedMsg" approved="yes">
<source><![CDATA[A common Solr core was found in the root-page. This is deprecated since Kitodo.Presentation 1.1. Solr cores should be stored in the client's SysFolder instead. Move a Solr core to this SysFolder (manually) or create a new one automatically.&lt;br /&gt;&lt;br /&gt;&lt;a href="%s"&gt;Create new Solr core!&lt;/a&gt;]]></source>
</trans-unit>
<trans-unit id="flash.solrcoreMissing" approved="yes">
<source><![CDATA[No Solr core found!]]></source>
</trans-unit>