WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lam/HISTORY
View File

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

2
lam/lib/html.inc
View File

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

8
lam/lib/types/group.inc
View File

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