From cc18bd29c6bebb95c05a43e8db31d1bfb46b58cf Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 15 Feb 2016 15:57:14 +0100 Subject: [PATCH] Make description a required attribute and do not generate it using 'o' or 'ou' attributes (fixes #9800) --- local/conf/LSobjects/config.LSobjects.LSsupannEntite.php | 5 +---- local/conf/LSobjects/config.LSobjects.LSsupannEntiteBase.php | 4 +--- local/conf/LSobjects/config.LSobjects.LSsupannOrg.php | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/local/conf/LSobjects/config.LSobjects.LSsupannEntite.php b/local/conf/LSobjects/config.LSobjects.LSsupannEntite.php index 306f7b7..fff8c78 100644 --- a/local/conf/LSobjects/config.LSobjects.LSsupannEntite.php +++ b/local/conf/LSobjects/config.LSobjects.LSsupannEntite.php @@ -124,9 +124,6 @@ $GLOBALS['LSobjects']['LSsupannEntite'] = array ( 'modify' => 1, 'create' => 1 ), - 'dependAttrs' => array ( - 'description' - ) ), /* ----------- end -----------*/ @@ -208,7 +205,7 @@ $GLOBALS['LSobjects']['LSsupannEntite'] = array ( 'label' => 'Description', 'ldap_type' => 'ascii', 'html_type' => 'textarea', - 'generate_value_format' => '%{ou}', + 'required' => 1, 'multiple' => 0, 'rights' => array( 'admin' => 'w' diff --git a/local/conf/LSobjects/config.LSobjects.LSsupannEntiteBase.php b/local/conf/LSobjects/config.LSobjects.LSsupannEntiteBase.php index 38c2572..0535eae 100644 --- a/local/conf/LSobjects/config.LSobjects.LSsupannEntiteBase.php +++ b/local/conf/LSobjects/config.LSobjects.LSsupannEntiteBase.php @@ -89,6 +89,7 @@ $GLOBALS['LSobjects']['LSsupannEntiteBase'] = array ( 'ldap_type' => 'ascii', 'html_type' => 'textarea', 'multiple' => 0, + 'required' => 1, ), /* ----------- end -----------*/ @@ -132,9 +133,6 @@ $GLOBALS['LSobjects']['LSsupannEntiteBase'] = array ( 'modify' => 1, 'create' => 1 ), - 'dependAttrs' => array ( - 'description' - ) ), /* ----------- end -----------*/ diff --git a/local/conf/LSobjects/config.LSobjects.LSsupannOrg.php b/local/conf/LSobjects/config.LSobjects.LSsupannOrg.php index 46e2a1a..f524498 100644 --- a/local/conf/LSobjects/config.LSobjects.LSsupannOrg.php +++ b/local/conf/LSobjects/config.LSobjects.LSsupannOrg.php @@ -193,8 +193,8 @@ $GLOBALS['LSobjects']['LSsupannOrg'] = array ( 'label' => 'Description', 'ldap_type' => 'ascii', 'html_type' => 'textarea', - 'generate_value_format' => '%{o}', 'multiple' => 0, + 'required' => 1, 'rights' => array( 'admin' => 'w' ),