Add latest changes from icehrm pro

This commit is contained in:
gamonoid
2018-05-21 00:23:56 +02:00
parent 9c56b8acd1
commit 861e94cf9d
1375 changed files with 175006 additions and 2662 deletions

View File

@@ -76,7 +76,7 @@ class CustomFieldManager
$customFieldsListOrdered[] = $order;
if ($type == "text" || $type == "textarea") {
if ($type == "text" || $type == "textarea" || $type == "fileupload") {
$object->customFields[$label] = $cf->value;
} elseif ($type == 'select' || $type == 'select2') {
$options = $customFields[$cf->name]->field_options;
@@ -132,7 +132,7 @@ class CustomFieldManager
}
}
$object->customFields[$label] = array($object->customFields[$label], $section);
$object->customFields[$label] = array($object->customFields[$label], $section, $type);
}
array_multisort($customFieldsListOrdered, SORT_DESC, SORT_NUMERIC, $object->customFields);