espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix modified and created fields

Browse Source
This commit is contained in:
yuri
2016-12-15 16:42:53 +02:00
parent fa3b4f3ac2
commit ef317064b4
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/ORM/Repositories/RDB.php
-26
View File
@@ -273,18 +273,6 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
$entity->set('createdById', $this->getEntityManager()->getUser()->id);
}
}
if ($entity->has('modifiedById')) {
$restoreData['modifiedById'] = $entity->get('modifiedById');
}
if ($entity->has('modifiedByName')) {
$restoreData['modifiedByName'] = $entity->get('modifiedByName');
}
if ($entity->has('modifiedAt')) {
$restoreData['modifiedAt'] = $entity->get('modifiedAt');
}
$entity->clear('modifiedById');
$entity->clear('modifiedByName');
} else {
if (empty($options['silent'])) {
if ($entity->hasAttribute('modifiedAt')) {
@@ -295,20 +283,6 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
$entity->set('modifiedByName', $this->getEntityManager()->getUser()->get('name'));
}
}
if ($entity->has('createdById')) {
if (empty($options['import'])) {
$restoreData['createdById'] = $entity->get('createdById');
$entity->clear('createdById');
}
}
if ($entity->has('createdAt')) {
if (empty($options['import'])) {
$restoreData['createdAt'] = $entity->get('createdAt');
$entity->clear('createdAt');
}
}
}
$this->restoreData = $restoreData;
application/Espo/Services/Record.php
+14
View File
@@ -530,6 +530,13 @@ class Record extends \Espo\Core\Services\Base
$this->filterInput($data);
$this->handleInput($data);
unset($data['modifiedById']);
unset($data['modifiedByName']);
unset($data['modifiedAt']);
unset($data['createdById']);
unset($data['createdByName']);
unset($data['createdAt']);
$entity->set($data);
$this->beforeCreate($entity, $data);
@@ -565,6 +572,13 @@ class Record extends \Espo\Core\Services\Base
$this->filterInput($data);
$this->handleInput($data);
unset($data['modifiedById']);
unset($data['modifiedByName']);
unset($data['modifiedAt']);
unset($data['createdById']);
unset($data['createdByName']);
unset($data['createdAt']);
if ($this->getEntityBeforeUpdate) {
$entity = $this->getEntity($id);
} else {