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

Merge branch 'master' into PHRAS-2967_Lightbox-de-of-send-email-report

Browse Source
This commit is contained in:
Nicolas Maillat
2020-03-06 15:02:11 +01:00
committed by GitHub
parent c98a0e54cc 18c57bfffa
commit 746f2ae4c4
34 changed files with 9576 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php
View File

@@ -474,6 +474,17 @@ class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine
return parent::hasRecord($app, $record);
}
/**
* {@inheritDoc}
*/
public function getElementByRecord(\Alchemy\Phrasea\Application $app, \record_adapter $record)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getElementByRecord', [$app, $record]);
return parent::getElementByRecord($app, $record);
}
/**
* {@inheritDoc}
*/

11
resources/proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php
View File

@@ -518,4 +518,15 @@ class LazaretFile extends \Alchemy\Phrasea\Model\Entities\LazaretFile implements
return parent::getRecordsToSubstitute($app, $includeReason);
}
/**
* {@inheritDoc}
*/
public function getStatus(\Alchemy\Phrasea\Application $app)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getStatus', [$app]);
return parent::getStatus($app);
}
}