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

#PHRAS-325 #time 3h

Browse Source 
added parameter "nosubdef" to route "/api/v1/records/add"
nb : does NOT prevent creation of subdef if file passes thru the quarantine.
This commit is contained in:
Jean-Yves Gaulier
2015-02-02 17:04:54 +01:00
parent 138008f7c6
commit 6449c58e17
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Alchemy/Phrasea/Border/Manager.php
View File

@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Border;
use Alchemy\Phrasea\Border\Checker\CheckerInterface; use Alchemy\Phrasea\Border\Checker\CheckerInterface;
use Alchemy\Phrasea\Border\Attribute\AttributeInterface; use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
use Alchemy\Phrasea\Media\Subdef\OptionType\Boolean;
use Alchemy\Phrasea\Metadata\Tag\TfArchivedate; use Alchemy\Phrasea\Metadata\Tag\TfArchivedate;
use Alchemy\Phrasea\Metadata\Tag\TfQuarantine; use Alchemy\Phrasea\Metadata\Tag\TfQuarantine;
use Alchemy\Phrasea\Metadata\Tag\TfBasename; use Alchemy\Phrasea\Metadata\Tag\TfBasename;
@@ -79,7 +80,7 @@ class Manager
* @param type $forceBehavior Force a behavior, one of the self::FORCE_* constant * @param type $forceBehavior Force a behavior, one of the self::FORCE_* constant
* @return int One of the self::RECORD_CREATED or self::LAZARET_CREATED constants * @return int One of the self::RECORD_CREATED or self::LAZARET_CREATED constants
*/ */
public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null) public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null, $nosubdef = false)
{ {
$visa = $this->getVisa($file); $visa = $this->getVisa($file);
@@ -92,7 +93,7 @@ class Manager
$this->addMediaAttributes($file); $this->addMediaAttributes($file);
$element = $this->createRecord($file); $element = $this->createRecord($file, $nosubdef);
$code = self::RECORD_CREATED; $code = self::RECORD_CREATED;
} else { } else {
@@ -228,10 +229,9 @@ class Manager
* @param File $file The package file * @param File $file The package file
* @return \record_adater * @return \record_adater
*/ */
protected function createRecord(File $file) protected function createRecord(File $file, $nosubdef=false)
{ {
$element = \record_adapter::createFromFile($file, $this->app); $element = \record_adapter::createFromFile($file, $this->app);
$date = new \DateTime(); $date = new \DateTime();
$file->addAttribute( $file->addAttribute(
@@ -302,7 +302,9 @@ class Manager
$this->app['phraseanet.metadata-setter']->replaceMetadata($newMetadata, $element); $this->app['phraseanet.metadata-setter']->replaceMetadata($newMetadata, $element);
if(!$nosubdef) {
$element->rebuild_subdefs(); $element->rebuild_subdefs();
}
$element->reindex(); $element->reindex();
return $element; return $element;

3
lib/classes/API/V1/adapter.php
View File

@@ -494,8 +494,7 @@ class API_V1_adapter extends API_V1_Abstract
throw new API_V1_exception_badrequest(sprintf('Invalid forceBehavior value `%s`', $request->get('forceBehavior'))); throw new API_V1_exception_badrequest(sprintf('Invalid forceBehavior value `%s`', $request->get('forceBehavior')));
break; break;
} }
$app['border-manager']->process($session, $Package, $callback, $behavior, $request->get('nosubdef')==='');
$app['border-manager']->process($session, $Package, $callback, $behavior);
$ret = array( $ret = array(
'entity' => null, 'entity' => null,

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

@@ -1412,7 +1412,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$record->delete_data_from_cache(\record_adapter::CACHE_SUBDEFS); $record->delete_data_from_cache(\record_adapter::CACHE_SUBDEFS);
$record->insertTechnicalDatas($app['mediavorus']); $record->insertTechnicalDatas($app['mediavorus']);
$record->rebuild_subdefs();
return $record; return $record;
} }