forked from wallabag/wallabag
Renamed methods
This commit is contained in:
@ -130,7 +130,7 @@ class AnnotationRepository extends EntityRepository
|
|||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public function findAllByArchivedEntriesAndUserId($userId)
|
public function findAllArchivedEntriesByUser($userId)
|
||||||
{
|
{
|
||||||
return $this->createQueryBuilder('a')
|
return $this->createQueryBuilder('a')
|
||||||
->leftJoin('a.entry', 'e')
|
->leftJoin('a.entry', 'e')
|
||||||
|
|||||||
@ -329,7 +329,7 @@ class ConfigController extends Controller
|
|||||||
*/
|
*/
|
||||||
private function removeTagsForArchivedByUserId($userId)
|
private function removeTagsForArchivedByUserId($userId)
|
||||||
{
|
{
|
||||||
$tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findTagsForArchivedArticles($userId);
|
$tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findForArchivedArticlesByUser($userId);
|
||||||
$this->removeAllTagsByStatusAndUserId($tags, $userId);
|
$this->removeAllTagsByStatusAndUserId($tags, $userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -339,7 +339,7 @@ class ConfigController extends Controller
|
|||||||
|
|
||||||
$archivedEntriesAnnotations = $this->getDoctrine()
|
$archivedEntriesAnnotations = $this->getDoctrine()
|
||||||
->getRepository('WallabagAnnotationBundle:Annotation')
|
->getRepository('WallabagAnnotationBundle:Annotation')
|
||||||
->findAllByArchivedEntriesAndUserId($userId);
|
->findAllArchivedEntriesByUser($userId);
|
||||||
|
|
||||||
foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
|
foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
|
||||||
$em->remove($archivedEntriesAnnotation);
|
$em->remove($archivedEntriesAnnotation);
|
||||||
|
|||||||
@ -77,7 +77,7 @@ class TagRepository extends EntityRepository
|
|||||||
->getSingleResult();
|
->getSingleResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findTagsForArchivedArticles($userId)
|
public function findForArchivedArticlesByUser($userId)
|
||||||
{
|
{
|
||||||
$ids = $this->createQueryBuilder('t')
|
$ids = $this->createQueryBuilder('t')
|
||||||
->select('t.id')
|
->select('t.id')
|
||||||
|
|||||||
Reference in New Issue
Block a user