Aller au contenu

Modifications pour le document Solr Search Macros

Modifié par Florent Charton le 2026/03/13 11:04
Depuis la version 4.1
modifié par Florent Charton
sur 2026/01/13 15:01
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/17.10.2]
À la version 5.1
modifié par Florent Charton
sur 2026/03/13 11:04
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/17.10.4]

Résumé

Détails

Propriétés de la Page
Contenu
... ... @@ -156,9 +156,10 @@
156 156   ## Show active facets (that have selected values or that have an explicit limit on the number of values, i.e.
157 157   ## pagination) as expanded. Collapse the rest, otherwise you have to scroll to see all the available facets.
158 158   #set ($facetValuesLimit = $request.getParameter("l_$facetField.name"))
159 - <div class="search-facet#if ($facetRequestValues || $facetValuesLimit) expanded#end" data-name="$facetField.name">
160 - #displaySearchFacetHeader($facetField)
161 - #displaySearchFacetBody($facetField)
159 + <div class="search-facet" data-name="$facetField.name">
160 + #set ($expanded = ($facetRequestValues || $facetValuesLimit))
161 + #displaySearchFacetHeader($facetField $expanded)
162 + #displaySearchFacetBody($facetField $expanded)
162 162   </div>
163 163   #end
164 164  #end
... ... @@ -175,7 +175,7 @@
175 175   #setVariable("$property" $classDocument.xWikiClass.get($classPropertyReference.name))
176 176  #end
177 177  
178 -#macro (displaySearchFacetHeader $facetField)
179 +#macro (displaySearchFacetHeader $facetField $expanded)
179 179   #set ($facetPrettyNameKey = "solr.field.$facetField.name")
180 180   #if ($services.localization.get($facetPrettyNameKey))
181 181   #set ($facetPrettyName = $services.localization.render($facetPrettyNameKey))
... ... @@ -191,7 +191,11 @@
191 191   #end
192 192   <div class="search-facet-header">
193 193   <label>$escapetool.xml($facetPrettyName)
194 - <button class="btn btn-xs facet-toggle"
195 + <button class="btn btn-xs facet-toggle#if(!$expanded) collapsed#end"
196 + type="button"
197 + data-toggle="collapse"
198 + data-target="#$escapetool.xml($facetField.name)-dropdown"
199 + aria-expanded="$expanded"
195 195   aria-controls="$escapetool.xml($facetField.name)-dropdown">
196 196   $services.icon.renderHTML('caret-down')
197 197   </button>
... ... @@ -199,8 +199,8 @@
199 199   </div>
200 200  #end
201 201  
202 -#macro (displaySearchFacetBody $facetField)
203 - <div id="$escapetool.xml($facetField.name)-dropdown" class="search-facet-body">
207 +#macro (displaySearchFacetBody $facetField $expanded)
208 + <div id="$escapetool.xml($facetField.name)-dropdown" class="search-facet-body collapse#if($expanded) in#end">
204 204   #set ($facetDisplayer = $solrConfig.facetDisplayers.get($facetField.name))
205 205   #if (!$facetDisplayer && $facetField.name.startsWith('property.'))
206 206   ## Choose a facet displayer based on the property type.