Skip to content
GitLab
Commit 8258f787 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5713-phones-have-wrong-attribute-order' into '1.3-dev' 

Resolve "Phones have wrong attribute order"

Closes #5713

See merge request !38
parents 2f0bf09a ba9dc20a
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
systems/admin/systems/class_phoneGeneric.inc
+ 1
− 1
View file @ 8258f787
...@@ -51,6 +51,7 @@ class phoneGeneric extends ipHostPlugin ...@@ -51,6 +51,7 @@ class phoneGeneric extends ipHostPlugin
'main' => array( 'main' => array(
'name' => _('Properties'), 'name' => _('Properties'),
'attrs' => array( 'attrs' => array(
new BaseSelectorAttribute(get_ou('phoneRDN')),
new HostNameAttribute ( new HostNameAttribute (
_('Name'), _('The name of the phone'), _('Name'), _('The name of the phone'),
'cn', TRUE 'cn', TRUE
...@@ -59,7 +60,6 @@ class phoneGeneric extends ipHostPlugin ...@@ -59,7 +60,6 @@ class phoneGeneric extends ipHostPlugin
_('Description'), _('A short description of the phone'), _('Description'), _('A short description of the phone'),
'description', FALSE 'description', FALSE
), ),
new BaseSelectorAttribute(get_ou('phoneRDN')),
) )
), ),
'phone' => array( 'phone' => array(
......
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