mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-04 13:17:29 +02:00
Code Issues Releases Wiki Activity

Version 1.4.8: Fix metafields userroles and fieldset style

Browse Source
This commit is contained in:
trendschau
2021-08-22 10:58:05 +02:00
parent 7f84ef2996
commit c4411486cb
3 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/Controllers/MetaApiController.php
View File

@@ -138,7 +138,15 @@ class MetaApiController extends ContentController
{
$userroles[$userrole] = $userrole;
}
$metadefinitions[$tabname]['fields'][$fieldname]['options'] = $userroles;
if(isset($fielddefinitions['fieldset']))
{
$metadefinitions[$tabname]['fields'][$fielddefinitions['fieldset']]['fields'][$fieldname]['options'] = $userroles;
}
else
{
$metadefinitions[$tabname]['fields'][$fieldname]['options'] = $userroles;
}
}
/*
@@ -241,7 +249,6 @@ class MetaApiController extends ContentController
$fieldDefinition['options'] = $userroles;
}
# validate user input for this field
$result = $validate->objectField($fieldName, $fieldValue, $objectName, $fieldDefinition);
@@ -382,16 +389,21 @@ class MetaApiController extends ContentController
}
# we have to flatten field definitions for tabs if there are fieldsets in it
public function flattenTabFields($tabfields, $flattab)
public function flattenTabFields($tabfields, $flattab, $fieldset = null)
{
foreach($tabfields as $name => $field)
{
if($field['type'] == 'fieldset')
{
$flattab = $this->flattenTabFields($field['fields'], $flattab);
$flattab = $this->flattenTabFields($field['fields'], $flattab, $name);
}
else
{
# add the name of the fieldset so we know to which fieldset it belongs for references
if($fieldset)
{
$field['fieldset'] = $fieldset;
}
$flattab[$name] = $field;
}
}