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

Remove all uses of databox_field::get_instance

Browse Source
This commit is contained in:
Benoît Burnichon
2015-07-08 01:20:45 +02:00
parent 82f19ee55d
commit 8ee5279d58
12 changed files with 72 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php
View File

@@ -34,7 +34,7 @@ class FieldsController extends Controller
foreach ($data as $jsonField) {
try {
$field = \databox_field::get_instance($this->app, $databox, $jsonField['id']);
$field = $metaStructure->get_element($jsonField['id']);
if ($field->get_name() !== $jsonField['name']) {
$this->validateNameField($metaStructure, $jsonField);
@@ -191,7 +191,7 @@ class FieldsController extends Controller
public function getField($sbas_id, $id)
{
$databox = $this->findDataboxById((int) $sbas_id);
$field = \databox_field::get_instance($this->app, $databox, $id);
$field = $databox->get_meta_structure()->get_element($id);
return $this->app->json($field->toArray());
}
@@ -199,7 +199,7 @@ class FieldsController extends Controller
public function updateField(Request $request, $sbas_id, $id)
{
$databox = $this->findDataboxById((int) $sbas_id);
$field = \databox_field::get_instance($this->app, $databox, $id);
$field = $databox->get_meta_structure()->get_element($id);
$data = $this->getFieldJsonFromRequest($request);
$this->validateTagField($data);
@@ -218,7 +218,7 @@ class FieldsController extends Controller
public function deleteField($sbas_id, $id)
{
$databox = $this->findDataboxById((int) $sbas_id);
\databox_field::get_instance($this->app, $databox, $id)->delete();
$databox->get_meta_structure()->get_element($id)->delete();
return new Response('', 204);
}