|
|
@@ -94,6 +94,7 @@ class Core_AclSimpleSchemaBase extends Core_AclBase {
|
|
|
if (is_array($value)) {
|
|
|
$fieldName = $key;
|
|
|
$field = [ 'name' => $fieldName, 'perms' => '', 'idZasob' => $generatedIdZasob ];
|
|
|
+ if (!empty($value['@label'])) $field['label'] = $value['@label'];
|
|
|
|
|
|
if (!empty($value['@type'])) $field['xsdType'] = "{$value['@type']}";
|
|
|
else if (!empty($value['@ref'])) {
|
|
|
@@ -212,6 +213,7 @@ class Core_AclSimpleSchemaBase extends Core_AclBase {
|
|
|
$fieldsById = array();
|
|
|
foreach ($this->getXsdTypes() as $fieldName => $field) {
|
|
|
$field['name'] = $fieldName;
|
|
|
+ $field['label'] = V::get('label', $fieldName, $field);
|
|
|
if ('p5:www_link' == $field['xsdType']) $field['simpleType'] = 'p5:www_link';
|
|
|
$fieldsById[ $field['idZasob'] ] = $field;
|
|
|
}
|
|
|
@@ -249,13 +251,13 @@ class Core_AclSimpleSchemaBase extends Core_AclBase {
|
|
|
if (empty($xsdTypes[$fieldName])) throw new Exception("Field '{$fieldName}' not exists");
|
|
|
return $xsdTypes[$fieldName]['xsdType'];
|
|
|
}
|
|
|
- public function isGeomField($fldName) {
|
|
|
+ public function isGeomField($fieldName) {
|
|
|
if ('File' == $fieldName) return false;
|
|
|
if ('AccessGroupRead' == $fieldName) return false;
|
|
|
if ('AccessGroupWrite' == $fieldName) return false;
|
|
|
if ('AccessOwner' == $fieldName) return false;
|
|
|
// if ('NestedObjectTest' == $fieldName) return false;
|
|
|
- // return $this->parentAcl->isGeomField($fldName);
|
|
|
+ // return $this->parentAcl->isGeomField($fieldName);
|
|
|
}
|
|
|
|
|
|
}
|