hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change getIsRead to isRead

Browse Source
This commit is contained in:
Benoît Burnichon
2015-12-21 15:51:56 +01:00
parent 4114b70003
commit 00d0ea66bb
8 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -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(),
];

4
lib/Alchemy/Phrasea/Controller/LightboxController.php
View File

@@ -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();
}

4
lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
View File

@@ -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();
}

4
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -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);

28
lib/Alchemy/Phrasea/Model/Entities/Basket.php
View File

@@ -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;
}
/**

6
lib/classes/record/adapter.php
View File

@@ -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');

8
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -11,11 +11,11 @@
<div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
id="SSTT_{{basket.getId()}}"
class="basketTips ui-accordion-header ui-state-default
ui-corner-all header SSTT basket {% if not basket.getIsRead() %}unread{% endif %}
ui-corner-all header SSTT basket {% if not basket.isRead() %}unread{% endif %}
{% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
<a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
<span>
{% if not basket.getIsRead() %}
{% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title=''/>
{% endif %}
<img src='/assets/common/images/icons/basket.png' title=''/>
@@ -84,14 +84,14 @@
<div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
id="SSTT_{{basket.getId()}}"
class="basketTips ui-accordion-header ui-state-default
ui-corner-all header SSTT basket {% if not basket.getIsRead() %}unread{% endif %}
ui-corner-all header SSTT basket {% if not basket.isRead() %}unread{% endif %}
{% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
<a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}" style="">
<span>
{% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title=''/>
{% elseif basket.getPusher() %}
{% if not basket.getIsRead() %}
{% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title=''/>
{% else %}
<img src='/assets/common/images/icons/basket_push.png' title=''/>

2
templates/web/prod/preview/appears_in.html.twig
View File

@@ -23,7 +23,7 @@
{% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title='' width="16" class="btn-image"/>
{% elseif basket.getPusher() %}
{% if not basket.getIsRead() %}
{% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="16" class="btn-image"/>
{% else %}
<img src='/assets/common/images/icons/basket_push.png' title='' width="16" class="btn-image"/>