Mglaser has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286437
Change subject: ExtendedSearch: Keep facet operator when changing facets
......................................................................
ExtendedSearch: Keep facet operator when changing facets
Facet operators are now stable when changing the facet. Before, the
operator changed back to default.
Change-Id: Id814ae9eb506e87a8d57287ab8b1a361621bff7b
---
M ExtendedSearch/includes/SearchIndex/SearchUriBuilder.class.php
M ExtendedSearch/resources/bluespice.facetsettings.js
2 files changed, 9 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/37/286437/1
diff --git a/ExtendedSearch/includes/SearchIndex/SearchUriBuilder.class.php
b/ExtendedSearch/includes/SearchIndex/SearchUriBuilder.class.php
index facc7bc..996fba3 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchUriBuilder.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchUriBuilder.class.php
@@ -71,9 +71,13 @@
*/
const OFFSET = 4096;
/**
+ * Facet operators.
+ */
+ const FSET = 8192;
+ /**
* Other params (?)
*/
- const EXTENDED = 8192;
+ const EXTENDED = 16384;
/**
* Combination of order, direction and offset (?)
*/
@@ -81,7 +85,7 @@
/**
* Everything
*/
- const ALL = 8191; // all but EXTENDED
+ const ALL = 16383; // all but EXTENDED
/**
* Instance of SearchOptions
@@ -150,6 +154,7 @@
$this->aUri[self::ASC] =
'search_asc='.$this->oSearchOptions->getOption( 'asc' );
$this->aUri[self::OFFSET] =
'search_offset='.$this->oSearchOptions->getOption( 'offset' );
$this->aUri[self::EXTENDED] = 'search_extended=1';
+ $this->aUri[self::FSET] = 'fset='.json_encode(
$this->oSearchOptions->getOption( 'fset' ) );
}
/**
@@ -188,6 +193,7 @@
if ( self::EDITOR & $components ) $aKeysWanted[self::EDITOR] =
true;
if ( self::ORDER & $components ) $aKeysWanted[self::ORDER] =
true;
if ( self::ASC & $components ) $aKeysWanted[self::ASC] = true;
+ if ( self::FSET & $components ) $aKeysWanted[self::FSET] = true;
if ( self::EXTENDED & $components )
$aKeysWanted[self::EXTENDED] = true;
$arrayKeysValuesWanted = array_intersect_key( $this->aUri ,
$aKeysWanted );
diff --git a/ExtendedSearch/resources/bluespice.facetsettings.js
b/ExtendedSearch/resources/bluespice.facetsettings.js
index 15e616d..91efe32 100644
--- a/ExtendedSearch/resources/bluespice.facetsettings.js
+++ b/ExtendedSearch/resources/bluespice.facetsettings.js
@@ -14,7 +14,7 @@
},
'settingschange': function() {
var fsets = {};
- $( '.bs-es-facetsettings' ).each(
function(){
+ $( '.bs-es-facetsettings' ).each(
function(index, me){
var fset = $(me).data( 'fset' );
var fsetparam = $(me).data(
'fset-param' );
fsets[fsetparam] = fset;
--
To view, visit https://gerrit.wikimedia.org/r/286437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id814ae9eb506e87a8d57287ab8b1a361621bff7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
