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

Merge pull request #3912 from alchemy-fr/PHRAS-3509-substitution-subdef-message-twice

Browse Source 
PHRAS-3509 Merge Prod - tools - document substitution - the generation message for sub-definition is published twice.
This commit is contained in:
Nicolas Maillat
2021-11-30 21:38:40 +01:00
committed by GitHub
parent 485bba35f7 f82597a45a
commit b59baf41d2
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Media/SubdefSubstituer.php
View File

@@ -74,8 +74,8 @@ class SubdefSubstituer
$this->createMediaSubdef($record, 'document', $media); $this->createMediaSubdef($record, 'document', $media);
$record->setMimeType($media->getFile()->getMimeType()); $record->setMimeType($media->getFile()->getMimeType(), false); // param to be false because subdefs will be rebuild later depends on $shouldSubdefsBeRebuilt
$record->setType($media->getType()); $record->setType($media->getType(), false);
$record->write_metas(); $record->write_metas();

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

@@ -267,11 +267,13 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
/** /**
* @param string $type * @param string $type
* @param bool $shouldSubdefsBeRebuilt
*
* @return $this * @return $this
* @throws Exception * @throws Exception
* @throws DBALException * @throws DBALException
*/ */
public function setType($type) public function setType($type, $shouldSubdefsBeRebuilt = true)
{ {
$type = strtolower($type); $type = strtolower($type);
@@ -284,7 +286,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
$sql = 'UPDATE record SET moddate = NOW(), type = :type WHERE record_id = :record_id'; $sql = 'UPDATE record SET moddate = NOW(), type = :type WHERE record_id = :record_id';
$this->getDataboxConnection()->executeUpdate($sql, ['type' => $type, 'record_id' => $this->getRecordId()]); $this->getDataboxConnection()->executeUpdate($sql, ['type' => $type, 'record_id' => $this->getRecordId()]);
if ($old_type !== $type) { if (($old_type !== $type) && $shouldSubdefsBeRebuilt) {
$this->dispatch(RecordEvents::SUBDEFINITION_CREATE, new SubdefinitionCreateEvent($this)); $this->dispatch(RecordEvents::SUBDEFINITION_CREATE, new SubdefinitionCreateEvent($this));
} }
@@ -330,8 +332,17 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
return $this->setMimeType($mime); return $this->setMimeType($mime);
} }
public function setMimeType($mime) /**
* @param $mime
* @param bool $shouldSubdefsBeRebuilt
*
* @return $this
* @throws DBALException
*/
public function setMimeType($mime, $shouldSubdefsBeRebuilt = true)
{ {
$oldMime = $this->getMimeType();
// see http://lists.w3.org/Archives/Public/xml-dist-app/2003Jul/0064.html // see http://lists.w3.org/Archives/Public/xml-dist-app/2003Jul/0064.html
if (!preg_match("/^[a-zA-Z0-9!#$%^&\\*_\\-\\+{}\\|'.`~]+\\/[a-zA-Z0-9!#$%^&\\*_\\-\\+{}\\|'.`~]+$/", $mime)) { if (!preg_match("/^[a-zA-Z0-9!#$%^&\\*_\\-\\+{}\\|'.`~]+\\/[a-zA-Z0-9!#$%^&\\*_\\-\\+{}\\|'.`~]+$/", $mime)) {
throw new \Exception(sprintf('Unrecognized mime type %s', $mime)); throw new \Exception(sprintf('Unrecognized mime type %s', $mime));
@@ -342,7 +353,9 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
array(':mime' => $mime, ':record_id' => $this->getRecordId()) array(':mime' => $mime, ':record_id' => $this->getRecordId())
)) { )) {
if (($oldMime !== $mime) && $shouldSubdefsBeRebuilt) {
$this->dispatch(RecordEvents::SUBDEFINITION_CREATE, new SubdefinitionCreateEvent($this)); $this->dispatch(RecordEvents::SUBDEFINITION_CREATE, new SubdefinitionCreateEvent($this));
}
$this->delete_data_from_cache(); $this->delete_data_from_cache();
} }