*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function searchFormAction(Request $request, $page)
+ public function searchFormAction(Request $request, $page, $currentRoute)
{
$form = $this->createForm(SearchEntryType::class);
return $this->render('WallabagCoreBundle:Entry:search_form.html.twig', [
'form' => $form->createView(),
+ 'currentRoute' => $currentRoute,
]);
}
{
$repository = $this->get('wallabag_core.entry_repository');
$searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
+ $currentRoute = (!is_null($request->get('currentRoute')) ? $request->get('currentRoute') : '');
switch ($type) {
case 'search':
- $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm);
+ $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
break;
case 'untagged':
*
* @param int $userId
* @param string $term
+ * @param strint $currentRoute
*
* @return QueryBuilder
*/
- public function getBuilderForSearchByUser($userId, $term)
+ public function getBuilderForSearchByUser($userId, $term, $currentRoute)
{
- return $this
- ->getBuilderByUser($userId)
- ->andWhere('e.content LIKE :term')->setParameter('term', '%'.$term.'%')
- ->orWhere('e.title LIKE :term')->setParameter('term', '%'.$term.'%')
+ $qb = $this
+ ->getBuilderByUser($userId);
+
+ if ('starred' === $currentRoute) {
+ $qb->andWhere('e.isStarred = true');
+ } elseif ('unread' === $currentRoute) {
+ $qb->andWhere('e.isArchived = false');
+ } elseif ('archive' === $currentRoute) {
+ $qb->andWhere('e.isArchived = true');
+ }
+
+ $qb
+ ->andWhere('e.content LIKE :term OR e.title LIKE :term')->setParameter('term', '%'.$term.'%')
->leftJoin('e.tags', 't')
->groupBy('e.id')
->having('count(t.id) = 0');
+
+ return $qb;
}
/**
# archived: 'Archived entries'
# filtered: 'Filtered entries'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
# number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
# page_title: 'Edit an entry'
# title_label: 'Title'
archived: 'Archivierte Einträge'
filtered: 'Gefilterte Einträge'
filtered_tags: 'Gefiltert nach Tags:'
+ # filtered_search: 'Filtered by search:'
untagged: 'Nicht getaggte Einträge'
list:
number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
placeholder: 'https://website.de'
form_new:
url_label: URL
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Eintrag bearbeiten'
title_label: 'Titel'
archived: 'Artículos archivados'
filtered: 'Artículos filtrados'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Editar un artículo'
title_label: 'Título'
archived: 'مقالههای بایگانیشده'
filtered: 'مقالههای فیلترشده'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
number_on_the_page: '{0} هیج مقالهای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
placeholder: 'http://website.com'
form_new:
url_label: نشانی
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'ویرایش مقاله'
title_label: 'عنوان'
archived: "Articles lus"
filtered: "Articles filtrés"
filtered_tags: "Articles filtrés par tags :"
+ filtered_search: 'Articles filtrés par une recherche :'
untagged: "Article sans tag"
list:
number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
placeholder: "http://website.com"
form_new:
url_label: "Adresse"
+ search:
+ placeholder: "Que recherchez-vous ?"
edit:
page_title: "Éditer un article"
title_label: "Titre"
archived: 'Contenuti archiviati'
filtered: 'Contenuti filtrati'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Modifica voce'
title_label: 'Titolo'
archived: 'Articles legits'
filtered: 'Articles filtrats'
filtered_tags: 'Filtats per etiquetas:'
+ # filtered_search: 'Filtered by search:'
untagged: 'Articles sens etiqueta'
list:
number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Modificar un article'
title_label: 'Títol'
archived: 'Zarchiwizowane wpisy'
filtered: 'Odfiltrowane wpisy'
filtered_tags: 'Filtrowane po tagach:'
+ # filtered_search: 'Filtered by search:'
untagged: 'Odtaguj wpisy'
list:
number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Edytuj wpis'
title_label: 'Tytuł'
archived: 'Entradas arquivadas'
filtered: 'Entradas filtradas'
filtered_tags: 'Filtrar por tags:'
+ # filtered_search: 'Filtered by search:'
untagged: 'Entradas sem tags'
list:
number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Editar uma entrada'
title_label: 'Título'
# archived: 'Archived entries'
# filtered: 'Filtered entries'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
# number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
# page_title: 'Edit an entry'
# title_label: 'Title'
# archived: 'Archived entries'
# filtered: 'Filtered entries'
# filtered_tags: 'Filtered by tags:'
+ # filtered_search: 'Filtered by search:'
# untagged: 'Untagged entries'
list:
number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
placeholder: 'http://website.com'
form_new:
url_label: Url
+ search:
+ # placeholder: 'What are you looking for?'
edit:
page_title: 'Makaleyi düzenle'
title_label: 'Başlık'
<span class="black-text">{{ form_errors(form.term) }}</span>
{% endif %}
+ <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
+
{{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
{{ form_rest(form) }}
</ul>
</div>
<div class="input-field nav-panel-search" style="display: none">
- {{ render(controller("WallabagCoreBundle:Entry:searchForm")) }}
+ {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
<label for="search" class="active"><i class="material-icons search">search</i></label>
<i class="material-icons close">clear</i>
</div>
projects / github / wallabag / wallabag.git / commitdiff
