Commit 0142d830 authored by Tomas Norre Mikkelsen's avatar Tomas Norre Mikkelsen

Merge branch 'composer-requirements-update' into 'develop'

[TASK] Update ext:typo3_console, ext:solr, ext:secure_web

See merge request !428
parents 85f4ffe2 eef1def2
Pipeline #7439 passed with stages
in 4 minutes and 3 seconds
This diff is collapsed.
...@@ -15,6 +15,7 @@ namespace T3o\TerFe2\Solr\IndexQueue; ...@@ -15,6 +15,7 @@ namespace T3o\TerFe2\Solr\IndexQueue;
*/ */
use ApacheSolrForTypo3\Solr\IndexQueue\Item; use ApacheSolrForTypo3\Solr\IndexQueue\Item;
use ApacheSolrForTypo3\Solr\System\Solr\Document\Document;
use T3o\TerFe2\Utility\VersionUtility; use T3o\TerFe2\Utility\VersionUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility; use TYPO3\CMS\Core\Utility\VersionNumberUtility;
...@@ -55,14 +56,14 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer ...@@ -55,14 +56,14 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer
* *
* @param Item $item An index queue item * @param Item $item An index queue item
* @param int $language Language Id * @param int $language Language Id
* @return \Apache_Solr_Document The Solr document converted from the record * @return \ApacheSolrForTypo3\Solr\System\Solr\Document\Document The Solr document converted from the record
*/ */
protected function itemToDocument(Item $item, $language = 0) protected function itemToDocument(Item $item, $language = 0): Document
{ {
$document = null; $document = null;
$itemRecord = $this->getFullItemRecord($item, $language); $itemRecord = $this->getFullItemRecord($item, $language);
if (!is_null($itemRecord)) { if ($itemRecord !== null) {
$itemIndexingConfiguration = $this->getItemTypeConfiguration( $itemIndexingConfiguration = $this->getItemTypeConfiguration(
$item, $item,
$language $language
...@@ -77,11 +78,11 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer ...@@ -77,11 +78,11 @@ class TerIndexer extends \ApacheSolrForTypo3\Solr\IndexQueue\Indexer
} }
/** /**
* @param \Apache_Solr_Document $document * @param \ApacheSolrForTypo3\Solr\System\Solr\Document\Document $document
* @param array $itemRecord * @param array $itemRecord
* @return \Apache_Solr_Document * @return \ApacheSolrForTypo3\Solr\System\Solr\Document\Document
*/ */
public function addSpecialFields(\Apache_Solr_Document $document, array $itemRecord) public function addSpecialFields(Document $document, array $itemRecord): Document
{ {
$extension = $this->extensionRepository->findByUid($itemRecord['uid']); $extension = $this->extensionRepository->findByUid($itemRecord['uid']);
......
...@@ -18,3 +18,11 @@ plugin.tx_ter_pi1.wsdlNamespace = https://extensions.typo3.org/wsdl/tx_ter/ ...@@ -18,3 +18,11 @@ plugin.tx_ter_pi1.wsdlNamespace = https://extensions.typo3.org/wsdl/tx_ter/
[applicationContext = Production/Stage] [applicationContext = Production/Stage]
plugin.tx_ter_pi1.wsdlNamespace = https://extensions-stage.typo3.org/wsdl/tx_ter/ plugin.tx_ter_pi1.wsdlNamespace = https://extensions-stage.typo3.org/wsdl/tx_ter/
[global] [global]
plugin.tx_solr {
view {
templateRootPath = EXT:ter_layout/Resources/Private/Templates/Solr/
partialRootPath = EXT:ter_layout/Resources/Private/Partials/Solr/
layoutRootPath = EXT:ter_layout/Resources/Private/Layouts/Solr/
}
}
plugin.tx_solr { plugin.tx_solr {
view {
layoutRootPaths {
0 = EXT:solr/Resources/Private/Layouts
}
partialRootPaths {
0 = EXT:solr/Resources/Private/Partials
100 = EXT:ter_layout/Resources/Private/Partials/Solr/
}
templateRootPaths {
0 = EXT:solr/Resources/Private/Templates
100 = EXT:ter_layout/Resources/Private/Templates/Solr/
}
}
search { search {
ignoreGlobalQParameter = 1 ignoreGlobalQParameter = 1
query { query {
......
<div class="tx_solr">
<div class="row">
<div class="col-md-12">
<f:render section="content" />
</div>
</div>
</div>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div id="tx-solr-faceting" class="d-none d-lg-block d-xl-block"> <div id="tx-solr-faceting" class="d-none d-lg-block d-xl-block">
<div class="card-container"> <div class="card-container">
<f:if condition="{resultSet.facets.used -> f:count()}"> <f:if condition="{resultSet.facets.used -> f:count()}">
<div class="card card-size-large" id="tx-solr-facets-in-use"> <div class="card card-size-large mb-3" id="tx-solr-facets-in-use">
<div class="card-header"> <div class="card-header">
<s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate> <s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate>
</div> </div>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</ul> </ul>
</div> </div>
<div class=""> <div class="">
<a href="{s:uri.facet.removeAllFacets()}" class="btn btn-primary btn-block solr-ajaxified"> <a href="{s:uri.facet.removeAllFacets()}" class="btn btn-primary btn-block solr-ajaxified mb-0">
<strong><i class="fa fa-times"></i> <strong><i class="fa fa-times"></i>
<s:translate key="faceting_removeAllFilters">Remove all filters</s:translate> <s:translate key="faceting_removeAllFilters">Remove all filters</s:translate>
</strong> </strong>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div class="facet-area-main"> <div class="facet-area-main">
<div class="solr-facets-available secondaryContentSection"> <div class="solr-facets-available secondaryContentSection">
<f:for each="{areaFacets}" as="facet"> <f:for each="{areaFacets}" as="facet">
<div class="card card-size-large"> <div class="card card-size-large mb-3">
<f:render partial="Facets/{facet.partialName}" arguments="{resultSet:resultSet, facet:facet}" /> <f:render partial="Facets/{facet.partialName}" arguments="{resultSet:resultSet, facet:facet}" />
</div> </div>
</f:for> </f:for>
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers" xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/"> xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
<f:layout name="Main" /> <f:layout name="Fullwidth" />
<f:section name="main"> <f:section name="content">
<div class="container-fluid"> <div class="container-fluid">
<f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" /> <f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" />
<f:if condition="{resultSet.usedSearch.numberOfResults}"> <f:if condition="{resultSet.allResultCount}">
<f:else> <f:else>
<div class="alert alert-danger mt-3"> <div class="alert alert-danger mt-3">
<s:translate key="no_results_nothing_found" arguments="{0: resultSet.usedQuery.queryString}">Nothing found for "%s".</s:translate> <s:translate key="no_results_nothing_found" arguments="{0: resultSet.usedQuery.queryString}">Nothing found for "%s".</s:translate>
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
</f:then> </f:then>
</f:if> </f:if>
<f:if condition="{hasSearched}"> <f:if condition="{resultSet.hasSearched}">
<s:widget.resultPaginate resultSet="{resultSet}" configuration="{maximumNumberOfLinks: settings.maximumNumberOfLinks, templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}"> <s:widget.resultPaginate resultSet="{resultSet}" configuration="{maximumNumberOfLinks: settings.maximumNumberOfLinks, templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}">
<f:variable name="exactMatchFound" value="0" /> <f:variable name="exactMatchFound" value="0" />
<f:if condition="{resultSet.usedQuery.queryString -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}"> <f:if condition="{resultSet.usedQuery.options.query -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}">
<f:render partial="Result/Document" section="DocumentWrap" arguments="{resultSet:resultSet, document:documents.0, exactMatchFound: 1}" /> <f:render partial="Result/Document" section="DocumentWrap" arguments="{resultSet:resultSet, document:documents.0, exactMatchFound: 1}" />
<f:variable name="exactMatchFound" value="1" /> <f:variable name="exactMatchFound" value="1" />
</f:if> </f:if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment