diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index 2f3777e22b..6c072c2fdb 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -1444,7 +1444,7 @@ class V1Controller extends Controller 'pusher_usr_id' => $basket->getPusher() ? $basket->getPusher()->getId() : null, 'pusher' => $basket->getPusher() ? $this->listUser($basket->getPusher()) : null, 'updated_on' => $basket->getUpdated()->format(DATE_ATOM), - 'unread' => !$basket->getIsRead(), + 'unread' => !$basket->isRead(), 'validation_basket' => !!$basket->getValidation(), ]; diff --git a/lib/Alchemy/Phrasea/Controller/LightboxController.php b/lib/Alchemy/Phrasea/Controller/LightboxController.php index 0369341102..7e22c8db34 100644 --- a/lib/Alchemy/Phrasea/Controller/LightboxController.php +++ b/lib/Alchemy/Phrasea/Controller/LightboxController.php @@ -232,10 +232,10 @@ class LightboxController extends Controller */ private function markBasketRead(Basket $basket) { - if ($basket->getIsRead() === false) { + if ($basket->isRead() === false) { /** @var Basket $basket */ $basket = $this->app['orm.em']->merge($basket); - $basket->setIsRead(true); + $basket->markRead(); $this->app['orm.em']->flush(); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php index 98e0438049..32c187a19f 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php @@ -24,8 +24,8 @@ class BasketController extends Controller { public function displayBasket(Request $request, Basket $basket) { - if ($basket->getIsRead() === false) { - $basket->setIsRead(true); + if ($basket->isRead() === false) { + $basket->markRead(); $this->getEntityManager()->flush(); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php index 2fbe95f08e..75ee7e9475 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php @@ -97,7 +97,7 @@ class PushController extends Controller $Basket->setDescription($push_description); $Basket->setUser($user_receiver); $Basket->setPusher($this->getAuthenticatedUser()); - $Basket->setIsRead(false); + $Basket->markUnread(); $manager->persist($Basket); @@ -212,7 +212,7 @@ class PushController extends Controller $basket->setName($validation_name); $basket->setDescription($validation_description); $basket->setUser($this->getAuthenticatedUser()); - $basket->setIsRead(false); + $basket->markUnread(); $manager->persist($basket); diff --git a/lib/Alchemy/Phrasea/Model/Entities/Basket.php b/lib/Alchemy/Phrasea/Model/Entities/Basket.php index d24ac6d6b3..c2d11425b8 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/Basket.php +++ b/lib/Alchemy/Phrasea/Model/Entities/Basket.php @@ -55,7 +55,7 @@ class Basket /** * @ORM\Column(type="boolean", options={"default" = 0}) */ - private $is_read = false; + private $isRead = false; /** * @ORM\ManyToOne(targetEntity="User") @@ -182,27 +182,23 @@ class Basket return $this->user; } - /** - * Set is_read - * - * @param boolean $isRead - * @return Basket - */ - public function setIsRead($isRead) + public function markRead() { - $this->is_read = $isRead; + $this->isRead = true; return $this; } - /** - * Get is_read - * - * @return boolean - */ - public function getIsRead() + public function markUnread() { - return $this->is_read; + $this->isRead = false; + + return $this; + } + + public function isRead() + { + return $this->isRead; } /** diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index c24b399128..b89e43ec48 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -1648,8 +1648,14 @@ class record_adapter implements RecordInterface, cache_cacheableInterface * @return set_selection * @throws Exception * @throws \Doctrine\DBAL\DBALException + * @deprecated use {@link self::getChildren} instead. */ public function get_children() + { + return $this->getChildren(); + } + + public function getChildren() { if (!$this->isStory()) { throw new Exception('This record is not a grouping'); diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index e2468854bd..a7079fea50 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -11,11 +11,11 @@