From a0537e637691031390b53e32322ff0dde0afa96f Mon Sep 17 00:00:00 2001
From: Mortier Benoit <benoit.mortier@opensides.be>
Date: Tue, 1 Mar 2016 14:22:47 +0100
Subject: [PATCH] Fixes: #4531 The co (country friendlyName) in department and
organization should be added and be dropdown filled from the configuration
backend
Adding co and a string field
Signed-off-by: Mortier Benoit <benoit.mortier@opensides.be>
---
contrib/openldap/core-fd.schema | 2 +-
plugins/admin/departments/class_department.inc | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 4ecf57cac..95eb63ed1 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -108,7 +108,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTU
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
DESC 'GOsa - Class to mark Departments for GOsa'
MUST ( ou $ description )
- MAY ( manager ))
+ MAY ( manager $ co ) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
DESC 'GOsa - Class for GOsa Accounts'
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 32c3ba547..d0096e48b 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -96,6 +96,9 @@ class department extends simplePlugin
new StringAttribute(
_('Location'), _('Location'), 'l', FALSE
),
+ new StringAttribute(
+ _('Country'), _('Country'), 'co', FALSE
+ ),
new TextAreaAttribute(
_('Address'), sprintf(_('A postal address for this %s'), $name),
'postalAddress', FALSE
--
GitLab