jenkins-bot has submitted this change and it was merged.
Change subject: Allow switching completion suggester between default and beta
feature
......................................................................
Allow switching completion suggester between default and beta feature
CirrusSearch was only setup to offer completion suggester as a
beta feature. This changes CirrusSearchUseCompletionSuggester into
a tri-modeaflag to toggle between off, beta, and on.
Bug: T128774
Change-Id: I3ee645f003189b855ba1b4e623338e121499f9ba
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Hooks.php
3 files changed, 17 insertions(+), 9 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
Objections:
Cindy-the-browser-test-bot: There's a problem with this change, please improve
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 33e6417..1a0a9d5 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -771,10 +771,12 @@
* You have to build the completion suggester index with the maintenance script
* updateSuggesterIndex.php. The suggester only supports queries to the main
* namespace. PrefixSearch will be used in all other cases.
- *
- * NOTE: This is an experimental API
+ * Valid values, all unknown values map to 'no':
+ * yes - Use completion suggester as the default
+ * beta - Allow users to enable completion suggester as a BetaFeature
+ * no - Don't use completion suggester
*/
-$wgCirrusSearchUseCompletionSuggester = false;
+$wgCirrusSearchUseCompletionSuggester = 'no';
/**
* Maximum number of results to ask from the elasticsearch completion
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 695f3b8..2b969e4 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -528,7 +528,8 @@
}
protected function completionSuggesterEnabled( SearchConfig $config ) {
- if( !$config->getElement( 'CirrusSearchUseCompletionSuggester'
) ) {
+ $useCompletion = $config->getElement(
'CirrusSearchUseCompletionSuggester' );
+ if( $useCompletion !== 'yes' && $useCompletion !== 'beta' ) {
return false;
}
@@ -547,8 +548,12 @@
return true;
}
- return class_exists( '\BetaFeatures' ) &&
- \BetaFeatures::isFeatureEnabled( $GLOBALS['wgUser'],
'cirrussearch-completionsuggester' );
+ if ( $useCompletion === 'beta' ) {
+ return class_exists( '\BetaFeatures' ) &&
+ \BetaFeatures::isFeatureEnabled(
$GLOBALS['wgUser'], 'cirrussearch-completionsuggester' );
+ }
+
+ return true;
}
/**
diff --git a/includes/Hooks.php b/includes/Hooks.php
index f656afb..b38bf96 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -610,8 +610,7 @@
*/
public static function onResourceLoaderGetConfigVars( &$vars ) {
global $wgCirrusSearchEnableSearchLogging,
- $wgCirrusSearchFeedbackLink,
- $wgCirrusSearchUseCompletionSuggester;
+ $wgCirrusSearchFeedbackLink;
$vars += array(
'wgCirrusSearchEnableSearchLogging' =>
$wgCirrusSearchEnableSearchLogging,
@@ -654,9 +653,11 @@
public static function getBetaFeaturePreferences( User $user, &$pref ) {
global $wgCirrusSearchUseCompletionSuggester,
$wgExtensionAssetsPath;
- if ( !$wgCirrusSearchUseCompletionSuggester ) {
+
+ if ( $wgCirrusSearchUseCompletionSuggester !== 'beta' ) {
return true;
}
+
$pref['cirrussearch-completionsuggester'] = array(
'label-message' =>
'cirrussearch-completionsuggester-pref',
'desc-message' =>
'cirrussearch-completionsuggester-desc',
--
To view, visit https://gerrit.wikimedia.org/r/275592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ee645f003189b855ba1b4e623338e121499f9ba
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
