diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Description.php b/lib/Alchemy/Phrasea/Controller/Admin/Description.php index ed4736d764..a97f94858e 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Description.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Description.php @@ -59,7 +59,7 @@ class Description implements ControllerProviderInterface $field = \databox_field::get_instance($databox, $id); $field->set_name($request->get('name_' . $id)); $field->set_thumbtitle($request->get('thumbtitle_' . $id)); - $field->set_source($request->get('src_' . $id)); + $field->set_tag(\databox_field::loadClassFromTagName($request->get('src_' . $id))); $field->set_multi($request->get('multi_' . $id)); $field->set_business($request->get('business_' . $id)); $field->set_indexable($request->get('indexable_' . $id)); diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php b/lib/Alchemy/Phrasea/Controller/Admin/Fields.php index 8c56537aee..867158574c 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Fields.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Fields.php @@ -38,11 +38,11 @@ class Fields implements ControllerProviderInterface $multi = ($request->get('multi') === 'true'); - $metadata = \databox_field::load_class_from_xpath($request->get('source')); + $tag = \databox_field::loadClassFromTagName($request->get('source')); $datas = array( - 'result' => ($multi === $metadata->is_multi()) - , 'is_multi' => $metadata->is_multi() + 'result' => ($multi === $tag->isMulti()), + 'is_multi' => $tag->isMulti(), ); $Serializer = $app['Core']['Serializer']; @@ -58,19 +58,19 @@ class Fields implements ControllerProviderInterface $request = $app['request']; $readonly = ($request->get('readonly') === 'true'); - $metadata = \databox_field::load_class_from_xpath($request->get('source')); + $tag = \databox_field::loadClassFromTagName($request->get('source')); $datas = array( - 'result' => ($readonly === $metadata->is_readonly()) - , 'is_readonly' => $metadata->is_readonly() + 'result' => ($readonly !== $tag->isWritable()), + 'is_readonly' => ! $tag->isWritable(), ); $Serializer = $app['Core']['Serializer']; return new Response( - $Serializer->serialize($datas, 'json') - , 200 - , array('Content-Type' => 'application/json') + $Serializer->serialize($datas, 'json'), + 200, + array('Content-Type' => 'application/json') ); });