mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 02:40:42 +02:00
Code Issues Releases Wiki Activity

Fix reindexing of options for select-fields

Browse Source
This commit is contained in:
trendschau
2024-08-07 16:45:38 +02:00
parent 4bed92e236
commit 8d13aeb1d8
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/typemill/Controllers/Controller.php
View File

@@ -133,8 +133,6 @@ abstract class Controller
return '/' . $url;
}
protected function addDatasets(array $formDefinitions)
{
foreach($formDefinitions as $fieldname => $field)
@@ -151,7 +149,14 @@ abstract class Controller
if(isset($field['options']) && is_array($field['options']))
{
$options = array_merge($options, $field['options']);
if ($this->has_sequential_numeric_keys($field['options']))
{
$options = array_merge($options, $field['options']);
}
else
{
$options = $options + $field['options'];
}
}
if(isset($field['dataset']) && ($field['dataset'] == 'userroles' ))
@@ -169,6 +174,13 @@ abstract class Controller
return $formDefinitions;
}
# Function to check if an array has sequential numeric keys starting from 0
protected function has_sequential_numeric_keys($array)
{
$keys = array_keys($array);
return $keys === range(0, count($keys) - 1);
}
protected function userroleIsAllowed($userrole, $resource, $action)
{
$acl = $this->c->get('acl');