[MediaWiki-commits] [Gerrit] ExtendedSearch: Show facet view when search yields no result - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: ExtendedSearch: Show facet view when search yields no result
..
ExtendedSearch: Show facet view when search yields no result
When search yields no result due to a selection of facets, it must
be possible to undo the last selection. This was not possible, because
the facet view was hidden when there was no result. This changed now,
so you can uncheck the facet settings that lead to a no results view.
Change-Id: Id5bc2029048d000a9854300cde1d7ea4032b219c
---
M ExtendedSearch/i18n/en.json
M ExtendedSearch/i18n/qqq.json
M ExtendedSearch/includes/SearchIndex/SearchResult.class.php
M ExtendedSearch/views/view.SearchResult.php
4 files changed, 79 insertions(+), 77 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ExtendedSearch/i18n/en.json b/ExtendedSearch/i18n/en.json
index 7f105c9..9b2d380 100644
--- a/ExtendedSearch/i18n/en.json
+++ b/ExtendedSearch/i18n/en.json
@@ -28,6 +28,7 @@
"bs-extendedsearch-indexing-specialpages": "Indexing special pages",
"bs-extendedsearch-invalid-query": "The query could not be processed.",
"bs-extendedsearch-nosearchterm": "Please enter a search term.",
+ "bs-extendedsearch-noresult": "No entries found.",
"bs-extendedsearch-result": "Search for \"$1\" found $2
{{PLURAL:$2|result|results}}.",
"bs-extendedsearch-result-caption": "$1 - $2 out of $3
{{PLURAL:$3|result|results}}",
"bs-extendedsearch-search-category": "Search in the categories:",
diff --git a/ExtendedSearch/i18n/qqq.json b/ExtendedSearch/i18n/qqq.json
index 7c7964c..26fb0b2 100644
--- a/ExtendedSearch/i18n/qqq.json
+++ b/ExtendedSearch/i18n/qqq.json
@@ -35,6 +35,7 @@
"bs-extendedsearch-indexing-specialpages": "Text for indexing special
pages\nIt is shown in the log file while index is being created\nNo punctuation
needed",
"bs-extendedsearch-invalid-query": "Text for the query could not be
processed.",
"bs-extendedsearch-nosearchterm": "Text for please enter a search
term.",
+ "bs-extendedsearch-noresult": "Text that is displayed in results view
when no entries are found.",
"bs-extendedsearch-result": "Search for \"$1\" found $2
{{PLURAL:$2|result|results}}.\n\n$1 is the search term in bold, $2 is the
number of results found",
"bs-extendedsearch-result-caption": "Text for $1 - $2 out of $3
results. The \"out of\" here means \"Expressing a fraction or a ratio\".
Parameters: \n* $1 - the start of shown result range\n* $2 - the end of shown
result range\n* $3 - the total number of results found - use for PLURAL
distinction",
"bs-extendedsearch-search-category": "Text for search in the
categories:",
diff --git a/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
b/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
index 9f05a6f..1ff91d6 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
@@ -109,8 +109,6 @@
$aMonitor['SearchTerm'] = $this->oSearchOptions->getOption(
'searchStringRaw' );
$aMonitor['EscalatedToFuzzy'] = $bFuzzy;
- if ( $iResults == 0 ) return $this->vSearchResult;
-
$this->createNavigation( $iResults );
if ( $bFacet ) {
diff --git a/ExtendedSearch/views/view.SearchResult.php
b/ExtendedSearch/views/view.SearchResult.php
index 61c00ef..a61d492 100644
--- a/ExtendedSearch/views/view.SearchResult.php
+++ b/ExtendedSearch/views/view.SearchResult.php
@@ -86,82 +86,84 @@
$aOut[] = parent::execute();
$aOut[] = $this->sOut;
- if ( !empty( $this->aResultEntryView ) ) {
- $sResults = implode( "\n", $this->aResultEntryView );
- $aOut[] = '';
- $aOut[] = '';
- if ( $this->getOption( 'siteUri' ) ) {
- $aOut[] = Xml::element(
- 'div',
- array(
- 'id' =>
'bs-extendedsearch-siteuri',
- 'siteuri' => $this->getOption(
'siteUri' )
- ),
- '',
- false
- );
- }
- $aOut[] = '';
- if ( $this->getOption( 'showfacets' ) ) {
-
- $sFilterBoxes = '';
- foreach ( $this->aFacetBoxes as $box ) {
- $sFilterBoxes .= $box->execute();
-
[MediaWiki-commits] [Gerrit] ExtendedSearch: Show facet view when search yields no result - change (mediawiki...BlueSpiceExtensions)
Mglaser has uploaded a new change for review.
https://gerrit.wikimedia.org/r/293689
Change subject: ExtendedSearch: Show facet view when search yields no result
..
ExtendedSearch: Show facet view when search yields no result
When search yields no result due to a selection of facets, it must
be possible to undo the last selection. This was not possible, because
the facet view was hidden when there was no result. This changed now,
so you can uncheck the facet settings that lead to a no results view.
Change-Id: Id5bc2029048d000a9854300cde1d7ea4032b219c
---
M ExtendedSearch/i18n/en.json
M ExtendedSearch/i18n/qqq.json
M ExtendedSearch/includes/SearchIndex/SearchResult.class.php
M ExtendedSearch/views/view.SearchResult.php
4 files changed, 79 insertions(+), 77 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/89/293689/1
diff --git a/ExtendedSearch/i18n/en.json b/ExtendedSearch/i18n/en.json
index 7f105c9..9b2d380 100644
--- a/ExtendedSearch/i18n/en.json
+++ b/ExtendedSearch/i18n/en.json
@@ -28,6 +28,7 @@
"bs-extendedsearch-indexing-specialpages": "Indexing special pages",
"bs-extendedsearch-invalid-query": "The query could not be processed.",
"bs-extendedsearch-nosearchterm": "Please enter a search term.",
+ "bs-extendedsearch-noresult": "No entries found.",
"bs-extendedsearch-result": "Search for \"$1\" found $2
{{PLURAL:$2|result|results}}.",
"bs-extendedsearch-result-caption": "$1 - $2 out of $3
{{PLURAL:$3|result|results}}",
"bs-extendedsearch-search-category": "Search in the categories:",
diff --git a/ExtendedSearch/i18n/qqq.json b/ExtendedSearch/i18n/qqq.json
index 7c7964c..26fb0b2 100644
--- a/ExtendedSearch/i18n/qqq.json
+++ b/ExtendedSearch/i18n/qqq.json
@@ -35,6 +35,7 @@
"bs-extendedsearch-indexing-specialpages": "Text for indexing special
pages\nIt is shown in the log file while index is being created\nNo punctuation
needed",
"bs-extendedsearch-invalid-query": "Text for the query could not be
processed.",
"bs-extendedsearch-nosearchterm": "Text for please enter a search
term.",
+ "bs-extendedsearch-noresult": "Text that is displayed in results view
when no entries are found.",
"bs-extendedsearch-result": "Search for \"$1\" found $2
{{PLURAL:$2|result|results}}.\n\n$1 is the search term in bold, $2 is the
number of results found",
"bs-extendedsearch-result-caption": "Text for $1 - $2 out of $3
results. The \"out of\" here means \"Expressing a fraction or a ratio\".
Parameters: \n* $1 - the start of shown result range\n* $2 - the end of shown
result range\n* $3 - the total number of results found - use for PLURAL
distinction",
"bs-extendedsearch-search-category": "Text for search in the
categories:",
diff --git a/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
b/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
index 9f05a6f..1ff91d6 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchResult.class.php
@@ -109,8 +109,6 @@
$aMonitor['SearchTerm'] = $this->oSearchOptions->getOption(
'searchStringRaw' );
$aMonitor['EscalatedToFuzzy'] = $bFuzzy;
- if ( $iResults == 0 ) return $this->vSearchResult;
-
$this->createNavigation( $iResults );
if ( $bFacet ) {
diff --git a/ExtendedSearch/views/view.SearchResult.php
b/ExtendedSearch/views/view.SearchResult.php
index 61c00ef..a61d492 100644
--- a/ExtendedSearch/views/view.SearchResult.php
+++ b/ExtendedSearch/views/view.SearchResult.php
@@ -86,82 +86,84 @@
$aOut[] = parent::execute();
$aOut[] = $this->sOut;
- if ( !empty( $this->aResultEntryView ) ) {
- $sResults = implode( "\n", $this->aResultEntryView );
- $aOut[] = '';
- $aOut[] = '';
- if ( $this->getOption( 'siteUri' ) ) {
- $aOut[] = Xml::element(
- 'div',
- array(
- 'id' =>
'bs-extendedsearch-siteuri',
- 'siteuri' => $this->getOption(
'siteUri' )
- ),
- '',
- false
- );
- }
- $aOut[] = '';
- if ( $this->getOption( 'showfacets' ) ) {
-
- $sFilterBoxes = '';
- foreach ( $this->aFacetBoxes as $box ) {
- $sFilterBoxes .= $box->execute();
-
