viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

naming fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-09-07 09:00:53 +03:00
parent bd0e7909a1
commit 7d5ad5d030
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/Espo/Controllers/FieldManager.php
View File

@@ -47,13 +47,13 @@ class FieldManager
{
protected $user;
protected $dataManager;
protected $fieldManager;
protected $fieldManagerTool;
public function __construct(User $user, DataManager $dataManager, FieldManagerTool $fieldManager)
public function __construct(User $user, DataManager $dataManager, FieldManagerTool $fieldManagerTool)
{
$this->user = $user;
$this->dataManager = $dataManager;
$this->fieldManager = $fieldManager;
$this->fieldManagerTool = $fieldManagerTool;
$this->checkControllerAccess();
}
@@ -74,7 +74,7 @@ class FieldManager
throw new BadRequest();
}
$data = $this->fieldManager->read($scope, $name);
$data = $this->fieldManagerTool->read($scope, $name);
if (!isset($data)) {
throw new BadRequest();
@@ -94,20 +94,20 @@ class FieldManager
throw new BadRequest();
}
$fieldManager = $this->fieldManager;
$fieldManagerTool = $this->fieldManagerTool;
$fieldManager->create($scope, $name, get_object_vars($data));
$fieldManagerTool->create($scope, $name, get_object_vars($data));
try {
$this->dataManager->rebuild($scope);
}
catch (Error $e) {
$fieldManager->delete($scope, $data->name);
$fieldManagerTool->delete($scope, $data->name);
throw new Error($e->getMessage());
}
return $fieldManager->read($scope, $data->name);
return $fieldManagerTool->read($scope, $data->name);
}
public function patchActionUpdate(Request $request)
@@ -126,17 +126,17 @@ class FieldManager
throw new BadRequest();
}
$fieldManager = $this->fieldManager;
$fieldManagerTool = $this->fieldManagerTool;
$fieldManager->update($scope, $name, get_object_vars($data));
$fieldManagerTool->update($scope, $name, get_object_vars($data));
if ($fieldManager->isChanged()) {
if ($fieldManagerTool->isChanged()) {
$this->dataManager->rebuild($scope);
} else {
$this->dataManager->clearCache();
}
return $fieldManager->read($scope, $name);
return $fieldManagerTool->read($scope, $name);
}
public function deleteActionDelete(Request $request)
@@ -148,7 +148,7 @@ class FieldManager
throw new BadRequest();
}
$result = $this->fieldManager->delete($scope, $name);
$result = $this->fieldManagerTool->delete($scope, $name);
$this->dataManager->rebuildMetadata();
@@ -163,7 +163,7 @@ class FieldManager
throw new BadRequest();
}
$this->fieldManager->resetToDefault($data->scope, $data->name);
$this->fieldManagerTool->resetToDefault($data->scope, $data->name);
$this->dataManager->clearCache();