From e49d89287c1cf071c9fabf072766f56a7236bb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 9 Mar 2021 12:41:40 +0100
Subject: [PATCH] =?UTF-8?q?:ambulance:=20feat(subscription)=20Ajout=20de?=
=?UTF-8?q?=20l=E2=80=99uid=20au=20ini,=20fix=20du=20dn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
issue #6152
---
contrib/openldap/core-fd.schema | 2 +-
plugins/addons/subscription/class_subscriptionInfo.inc | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index da1b451a5..a57a87e7a 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -123,4 +123,4 @@ objectclass ( 1.3.6.1.4.1.38414.62.2.1 NAME 'fdLockEntry' SUP top STRUCTURAL
objectclass ( 1.3.6.1.4.1.38414.62.2.2 NAME 'fdSubscriptionInformation' SUP top STRUCTURAL
DESC 'FusionDirectory - Information about current subscription'
MUST ( cn )
- MAY ( fdSubscriptionStartDate $ fdSubscriptionEndDate $ fdSubscriptionType $ fdSubscriptionContractId $ fdSubscriptionName ))
+ MAY ( uid $ fdSubscriptionStartDate $ fdSubscriptionEndDate $ fdSubscriptionType $ fdSubscriptionContractId $ fdSubscriptionName ))
diff --git a/plugins/addons/subscription/class_subscriptionInfo.inc b/plugins/addons/subscription/class_subscriptionInfo.inc
index 723fd2f7b..90b13b34e 100644
--- a/plugins/addons/subscription/class_subscriptionInfo.inc
+++ b/plugins/addons/subscription/class_subscriptionInfo.inc
@@ -23,6 +23,7 @@ class subscriptionInfo extends simplePlugin
/* ldap attribute => ini variable */
public static $subscriptionAttributes = [
'fdSubscriptionName' => 'Name',
+ 'uid' => 'Id',
'fdSubscriptionType' => 'Type',
'fdSubscriptionContractId' => 'Contract',
'fdSubscriptionStartDate' => 'StartDate',
@@ -40,6 +41,7 @@ class subscriptionInfo extends simplePlugin
'plObjectType' => [
'subscriptionInfo' => [
'name' => _('Subscription information'),
+ 'ou' => get_ou('fusiondirectoryRDN'),
]
],
'plSection' => 'conf',
@@ -62,6 +64,10 @@ class subscriptionInfo extends simplePlugin
_('Name'), _('Subscription name'),
'fdSubscriptionName', TRUE
),
+ new DisplayLDAPAttribute(
+ _('Id'), _('Subscription id'),
+ 'uid', TRUE
+ ),
new DisplayLDAPAttribute(
_('Type'), _('Subscription type'),
'fdSubscriptionType', TRUE
--
GitLab