devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-17 02:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2832 from Kdecherf/search-domain

Browse Source 
Search by term: extend to entries url
This commit is contained in:
Jeremy Benoist 2017-02-19 21:52:35 +01:00 committed by GitHub
commit bba94d7458
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View File

@ -106,8 +106,9 @@ class EntryRepository extends EntityRepository
$qb->andWhere('e.isArchived = true'); $qb->andWhere('e.isArchived = true');
} }
// We lower() all parts here because PostgreSQL 'LIKE' verb is case-sensitive
$qb $qb
->andWhere('e.content LIKE :term OR e.title LIKE :term')->setParameter('term', '%'.$term.'%') ->andWhere('lower(e.content) LIKE lower(:term) OR lower(e.title) LIKE lower(:term) OR lower(e.url) LIKE lower(:term)')->setParameter('term', '%'.$term.'%')
->leftJoin('e.tags', 't') ->leftJoin('e.tags', 't')
->groupBy('e.id'); ->groupBy('e.id');

24
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View File

@ -1093,5 +1093,29 @@ class EntryControllerTest extends WallabagCoreTestCase
$crawler = $client->submit($form, $data); $crawler = $client->submit($form, $data);
$this->assertCount(0, $crawler->filter('div[class=entry]')); $this->assertCount(0, $crawler->filter('div[class=entry]'));
// test url search on list of all articles
$crawler = $client->request('GET', '/all/list');
$form = $crawler->filter('form[name=search]')->form();
$data = [
'search_entry[term]' => 'domain', // the search will match an entry with 'domain' in its url
];
$crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter('div[class=entry]'));
// same as previous test but for case-sensitivity
$crawler = $client->request('GET', '/all/list');
$form = $crawler->filter('form[name=search]')->form();
$data = [
'search_entry[term]' => 'doMain', // the search will match an entry with 'domain' in its url
];
$crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter('div[class=entry]'));
} }
} }