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

Merge branch 4.0

Browse Source
This commit is contained in:
Thibaud Fabre
2016-12-05 15:26:48 +01:00
parent f6700fbe12
commit b5bbb1851f
315 changed files with 6552 additions and 29445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/patch/370alpha6a.php
View File

@@ -108,7 +108,7 @@ class patch_370alpha6a extends patchAbstract
$options['meta'] = $subdef->isMetadataUpdateRequired() ? 'yes' : 'no';
$options['devices'] = [databox_subdef::DEVICE_SCREEN];
$root->set_subdef($groupname, $subdef->get_name(), $subdef->get_class(), $subdef->is_downloadable(), $options, []);
$root->set_subdef($groupname, $subdef->get_name(), $subdef->get_class(), $subdef->isDownloadable(), $options, []);
}
protected function addMobileSubdefVideo($root, $baseSubdef, $groupname)

2
lib/classes/patch/390alpha13a.php
View File

@@ -77,7 +77,7 @@ class patch_390alpha13a implements patchInterface
foreach ($rs as $row) {
try {
$user = $em->createQuery('SELECT PARTIAL u.{id} FROM Phraseanet:User s WHERE u.id = :id')
$user = $em->createQuery('SELECT PARTIAL u.{id} FROM Phraseanet:User u WHERE u.id = :id')
->setParameters(['id' => $row['usr_id']])
->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true)
->getSingleResult();

18
lib/classes/patch/390alpha6a.php
View File

@@ -122,18 +122,18 @@ class patch_390alpha6a extends patchAbstract
$stmt->execute(['export_id' => $row['id']]);
$rs = $stmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($rs as $element) {
foreach ($rs as $element_row) {
$element = new FtpExportElement();
$element->setBaseId($row['base_id'])
->setRecordId($row['record_id'])
->setBusinessfields($row['businessfields'])
$element->setBaseId($element_row['base_id'])
->setRecordId($element_row['record_id'])
->setBusinessfields($element_row['businessfields'])
->setCreated(new \DateTime($row['date']))
->setUpdated(new \DateTime($row['date']))
->setDone(!!$row['done'])
->setError(!!$row['error'])
->setFilename($row['filename'])
->setFolder($row['folder'])
->setSubdef($row['subdef'])
->setDone(!!$element_row['done'])
->setError(!!$element_row['error'])
->setFilename($element_row['filename'])
->setFolder($element_row['folder'])
->setSubdef($element_row['subdef'])
->setExport($export);
$export->addElement($element);