support help text for custom fields

This commit is contained in:
Roland Gruber 2014-02-06 17:29:04 +00:00
parent d526ff09a8
commit 577be7d5a5
3 changed files with 7 additions and 4 deletions

View File

@ -8,6 +8,7 @@ March 2014 4.5
-> Separate IP restriction list for self service
-> Bind DLZ: support TXT/SRV records
-> Self Service: added language selection
-> Custom fields: support help texts
- fixed bugs:
-> PDF export for multiple entries does not work
-> Personal: fixed photo upload if Imagick is not installed

View File

@ -813,7 +813,7 @@ class htmlHelpLink extends htmlElement {
* @return array List of input field names and their type (name => type)
*/
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
// overwrite module and scop if needed
// overwrite module and scope if needed
if ($this->module != null) {
$module = $this->module;
}

View File

@ -110,9 +110,11 @@ class group extends baseType {
"roleOccupant" => _("Role member DNs"),
"description" => _("Group description")
);
$modules = $_SESSION['config']->get_AccountModules('group');
if (in_array('organizationalRole', $modules)) {
$return['cn'] = _('Role name');
if (!empty($_SESSION['config'])) {
$modules = $_SESSION['config']->get_AccountModules('group');
if (in_array('organizationalRole', $modules)) {
$return['cn'] = _('Role name');
}
}
return $return;
}