Commit 0979cb1e authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3452 Reworked user fields

Showing with 8 additions and 20 deletions
+8 -20
......@@ -122,8 +122,8 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
DESC 'Class for GOsa Accounts (v2.6.6)'
MUST ( )
MAY (
dateOfBirth $ gender $ gosaLoginRestriction $
gosaDefaultLanguage $ academicTitle $ personalTitle
gosaLoginRestriction $
gosaDefaultLanguage $ academicTitle $ personalTitle $ dateOfBirth $ gender
) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY
......
......@@ -4,10 +4,12 @@
.plugin_section#perso img#jpegPhoto_img {
position:absolute;
left:5px;
top:35px;
top:32px;
box-sizing:border-box;
max-height:80%;
}
.plugin_section#perso > div > table {
margin-left:160px;
padding-left:160px;
}
}
......@@ -192,7 +192,7 @@ class UserPasswordAttribute extends CompositeAttribute
class user extends simplePlugin
{
var $objectclasses = array('inetOrgPerson','pilotPerson','gosaAccount');
var $objectclasses = array('inetOrgPerson','gosaAccount');
var $mainTab = TRUE;
private $was_locked;
......@@ -208,7 +208,7 @@ class user extends simplePlugin
'plObjectType' => array('user' => array(
'description' => _('Users'),
'name' => _('User'),
'filter' => '(&(objectClass=inetOrgPerson)(objectClass=pilotPerson))',
'filter' => '(objectClass=inetOrgPerson)',
'mainAttr' => 'uid',
'nameAttr' => 'cn',
'icon' => 'geticon.php?context=types&icon=user&size=16',
......@@ -242,20 +242,6 @@ class user extends simplePlugin
'givenName', TRUE,
'', '', '/[^,+"?()=<>;\\\\]/'
),
new StringAttribute (
_('Personal title'), _('Personal title - Examples of personal titles are "Ms", "Dr", "Prof" and "Rev"'),
'personalTitle', FALSE
),
new DateAttribute (
_('Date of birth'), _('Date of birth'),
'dateOfBirth', FALSE,
'Y-m-d', ''
),
new SelectAttribute (
_('Sex'), _('Gender'),
'gender', FALSE,
array('', 'M', 'F'), '', array('', 'male', 'female')
),
new StringAttribute (
_('Description'), _('Short description of the user'),
'description', FALSE
......
  • bmortier @bmortier

    mentioned in issue #1149

    By bmortier on 2017-09-02T15:14:50 (imported from GitLab)

    ·

    mentioned in issue #1149

    By bmortier on 2017-09-02T15:14:50 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment