From 905ae369bd0238cc24c3c4e0ac60d578d30b54bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 5 Feb 2015 22:33:36 +0100 Subject: [PATCH] normalize entries fields --- .../Controller/WallabagRestController.php | 4 +- src/Wallabag/CoreBundle/Entity/Entries.php | 40 +++++++++---------- .../Repository/EntriesRepository.php | 16 ++++---- .../Resources/views/Entry/entries.html.twig | 4 +- .../Resources/views/Entry/entry.html.twig | 4 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index f14f821b..75de58f7 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php @@ -125,7 +125,7 @@ class WallabagRestController extends Controller } if (!is_null($isArchived)) { - $entry->setRead($isArchived); + $entry->setArchived($isArchived); } if (!is_null($isDeleted)) { @@ -133,7 +133,7 @@ class WallabagRestController extends Controller } if (!is_null($isStarred)) { - $entry->setFav($isStarred); + $entry->setStarred($isStarred); } $em = $this->getDoctrine()->getManager(); diff --git a/src/Wallabag/CoreBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php index ab5b859b..f06a2940 100644 --- a/src/Wallabag/CoreBundle/Entity/Entries.php +++ b/src/Wallabag/CoreBundle/Entity/Entries.php @@ -42,16 +42,16 @@ class Entries /** * @var boolean * - * @ORM\Column(name="is_read", type="boolean", nullable=true, options={"default" = false}) + * @ORM\Column(name="is_archived", type="boolean", nullable=true, options={"default" = false}) */ - private $isRead = false; + private $isArchived = false; /** * @var boolean * - * @ORM\Column(name="is_fav", type="boolean", nullable=true, options={"default" = false}) + * @ORM\Column(name="is_starred", type="boolean", nullable=true, options={"default" = false}) */ - private $isFav = false; + private $isStarred = false; /** * @var boolean @@ -180,61 +180,61 @@ class Entries } /** - * Set isRead + * Set isArchived * - * @param string $isRead + * @param string $isArchived * @return Entries */ - public function setRead($isRead) + public function setArchived($isArchived) { - $this->isRead = $isRead; + $this->isArchived = $isArchived; return $this; } /** - * Get isRead + * Get isArchived * * @return string */ - public function isRead() + public function isArchived() { - return $this->isRead; + return $this->isArchived; } public function toggleArchive() { - $this->isRead = $this->getIsRead() ^ 1; + $this->isArchived = $this->isArchived() ^ 1; return $this; } /** - * Set isFav + * Set isStarred * - * @param string $isFav + * @param string $isStarred * @return Entries */ - public function setFav($isFav) + public function setStarred($isStarred) { - $this->isFav = $isFav; + $this->isStarred = $isStarred; return $this; } /** - * Get isFav + * Get isStarred * * @return string */ - public function isFav() + public function isStarred() { - return $this->isFav; + return $this->isStarred; } public function toggleStar() { - $this->isFav = $this->getIsFav() ^ 1; + $this->isStarred = $this->isStarred() ^ 1; return $this; } diff --git a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php index ae854e5a..9965317a 100644 --- a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php @@ -23,9 +23,9 @@ class EntriesRepository extends EntityRepository ->select('e') ->setFirstResult($firstResult) ->setMaxResults($maxResults) - ->where('e.isRead = 0') + ->where('e.isArchived = false') ->andWhere('e.userId =:userId')->setParameter('userId', $userId) - ->andWhere('e.isDeleted=0') + ->andWhere('e.isDeleted=false') ->orderBy('e.createdAt', 'desc') ->getQuery(); @@ -48,9 +48,9 @@ class EntriesRepository extends EntityRepository ->select('e') ->setFirstResult($firstResult) ->setMaxResults($maxResults) - ->where('e.isRead = 1') + ->where('e.isArchived = true') ->andWhere('e.userId =:userId')->setParameter('userId', $userId) - ->andWhere('e.isDeleted=0') + ->andWhere('e.isDeleted=false') ->orderBy('e.createdAt', 'desc') ->getQuery(); @@ -73,9 +73,9 @@ class EntriesRepository extends EntityRepository ->select('e') ->setFirstResult($firstResult) ->setMaxResults($maxResults) - ->where('e.isFav = 1') + ->where('e.isStarred = true') ->andWhere('e.userId =:userId')->setParameter('userId', $userId) - ->andWhere('e.isDeleted=0') + ->andWhere('e.isDeleted=false') ->orderBy('e.createdAt', 'desc') ->getQuery(); @@ -91,11 +91,11 @@ class EntriesRepository extends EntityRepository ->where('e.userId =:userId')->setParameter('userId', $userId); if (!is_null($isArchived)) { - $qb->andWhere('e.isRead =:isArchived')->setParameter('isArchived', $isArchived); + $qb->andWhere('e.isArchived =:isArchived')->setParameter('isArchived', $isArchived); } if (!is_null($isStarred)) { - $qb->andWhere('e.isFav =:isStarred')->setParameter('isStarred', $isStarred); + $qb->andWhere('e.isStarred =:isStarred')->setParameter('isStarred', $isStarred); } if (!is_null($isDeleted)) { diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig index 2f8423d7..dfce4b3c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig @@ -35,8 +35,8 @@ {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig index edb15d55..f0c00509 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig @@ -11,8 +11,8 @@