Merge branch 'feature/fold-and-unfold-filter-by-click-12634'

resolves #12634
This commit is contained in:
Eric Lippmann 2016-12-08 14:30:55 +01:00
commit fed0fc9608

View File

@ -735,8 +735,10 @@ class FilterEditor extends AbstractWidget
public function renderSearch() public function renderSearch()
{ {
$preservedUrl = $this->preservedUrl();
$html = ' <form method="post" class="search inline" action="' $html = ' <form method="post" class="search inline" action="'
. $this->preservedUrl() . $preservedUrl
. '"><input type="text" name="q" style="width: 8em" class="search" value="" placeholder="' . '"><input type="text" name="q" style="width: 8em" class="search" value="" placeholder="'
. t('Search...') . t('Search...')
. '" /></form>'; . '" /></form>';
@ -749,9 +751,10 @@ class FilterEditor extends AbstractWidget
$title .= ': ' . $this->view()->escape($this->filter); $title .= ': ' . $this->view()->escape($this->filter);
} }
} }
return $html return $html
. '<a href="' . '<a href="'
. $this->preservedUrl()->with('modifyFilter', true) . $preservedUrl->with('modifyFilter', ! $preservedUrl->getParam('modifyFilter'))
. '" aria-label="' . '" aria-label="'
. $title . $title
. '" title="' . '" title="'