From de62999feaf63d8b308b6248286f01cfb17539e0 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 22 Sep 2020 15:04:31 +0200 Subject: [PATCH] LSattr_html::select_list: add get_possible_values parameter --- .../LSattr_html_select_list.docbook | 51 ++++++++++ .../class/class.LSattr_html_select_list.php | 93 +++++++++++++++--- src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 62090 -> 62658 bytes src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 38 ++++--- src/lang/ldapsaisie.pot | 32 ++++-- 5 files changed, 178 insertions(+), 36 deletions(-) diff --git a/doc/conf/LSattribute/LSattr_html/LSattr_html_select_list.docbook b/doc/conf/LSattribute/LSattr_html/LSattr_html_select_list.docbook index 778f7274..7c7fba2d 100644 --- a/doc/conf/LSattribute/LSattr_html/LSattr_html_select_list.docbook +++ b/doc/conf/LSattribute/LSattr_html/LSattr_html_select_list.docbook @@ -46,6 +46,7 @@ ) ) ), + 'get_possible_values' => [callable], 'translate_labels' => [booléen], 'sort' => [Booléen], 'sortDirection' => '[ASC|DESC]' @@ -178,6 +179,56 @@ + + get_possible_values + + Paramètre permettant de spécifier un callable qui sera utilisé + pour lister les valeurs possibles de l'attribut. Il recevra en paramètres les informations + suivantes: + + + $options + + Les options HTML de l'attribut. + + + + + $name + + Le nom de l'attribut. + + + + + &$ldapObject + + Une référence à l'objet LSldapObject. + + + + + + La valeur de retour attendue est un tableau associatif des valeurs possibles + de l'attribut avec la valeur que prendra l'attribut en tant que clé et le label + correspondant en tant que valeur. Tout autre retour sera considéré comme un échec + et déclenchera une erreur. + Il est également possible de regrouper des valeurs possibles de l'attribut: pour + cela, le tableau retourné devra lui-même contenir un tableau associatif contenant la + label traduit du groupe sous la clé label et les valeurs possibles + du groupe sous la clé possible_values. + Les valeurs retournées pourront être combinées avec les autres valeurs possibles + configurées de l'attribut. La prise en charge du tri des valeurs possibles est assurée + par la fonction appelante sauf dans le cas des sous-groupes de valeurs possibles. Dans + ce cas, la méthode LSattr_html_select_list :: _sort() pourra être + utilisée pour trier les valeurs du sous-groupe: cette méthode accepte en paramètre une + référence du tableau des valeurs possibles ainsi que les options HTML de l'attribut. + + Si la traduction des labels des valeurs possibles de l'attribut est activées + (voir ci-dessous), celle-ci doit être prise en charge par la fonction configurée. + + + translate_labels diff --git a/src/includes/class/class.LSattr_html_select_list.php b/src/includes/class/class.LSattr_html_select_list.php index 1979033f..d17df156 100644 --- a/src/includes/class/class.LSattr_html_select_list.php +++ b/src/includes/class/class.LSattr_html_select_list.php @@ -84,7 +84,7 @@ class LSattr_html_select_list extends LSattr_html{ /** * Return array of possible values with translated labels (if enabled) * - * @param[in] $options Attribute options (optional) + * @param[in] $options Attribute HTML options (optional) * @param[in] $name Attribute name (optional) * @param[in] &$ldapObject Related LSldapObject (optional) * @@ -93,10 +93,15 @@ class LSattr_html_select_list extends LSattr_html{ * @retval array Associative array with possible values as key and corresponding * translated label as value. */ - public static function _getPossibleValues($options=false,$name=false,&$ldapObject=false) { - $retInfos = array(); - $translate_labels = LSconfig :: get('translate_labels', true, 'bool', $options); - if (isset($options['possible_values']) && is_array($options['possible_values'])) { + public static function _getPossibleValues($options=false, $name=false, &$ldapObject=false) { + // Handle get_possible_values parameter + $retInfos = self :: getCallablePossibleValues($options, $name, $ldapObject); + if (!is_array($retInfos)) + $retInfos = array(); + + // Handle other configured possible values + if (is_array($options) && isset($options['possible_values']) && is_array($options['possible_values'])) { + $translate_labels = LSconfig :: get('translate_labels', true, 'bool', $options); foreach($options['possible_values'] as $val_key => $val_label) { if($val_key==='OTHER_OBJECT') { $objInfos=static :: getLSobjectPossibleValues($val_label,$options,$name); @@ -136,7 +141,7 @@ class LSattr_html_select_list extends LSattr_html{ } } - static :: _sort($retInfos,$options); + static :: _sort($retInfos, $options); return $retInfos; } @@ -163,11 +168,11 @@ class LSattr_html_select_list extends LSattr_html{ * Apply sort feature on possible values if this feature is enabled * * @param[in] &$retInfos array Possible values array reference to sort - * @param[in] $options array|false Attribute options + * @param[in] $options array|false Attribute HTML options * * @retval void **/ - protected static function _sort(&$retInfos, $options) { + public static function _sort(&$retInfos, $options) { if (!isset($options['sort']) || $options['sort']) { if (isset($options['sortDirection']) && $options['sortDirection']=='DESC') { uasort($retInfos,array('LSattr_html_select_list','_sortTwoValuesDesc')); @@ -223,7 +228,7 @@ class LSattr_html_select_list extends LSattr_html{ * Retourne un tableau des valeurs possibles d'un type d'objet * * @param[in] $conf OTHER_OBJECT configuration array - * @param[in] $options array|false Attribute options + * @param[in] $options array|false Attribute HTML options * @param[in] $name Attribute name * * @author Benjamin Renard @@ -294,7 +299,7 @@ class LSattr_html_select_list extends LSattr_html{ * Retourne un tableau des valeurs possibles d'un autre attribut * * @param[in] $attr OTHER_ATTRIBUTE configuration value - * @param[in] $options array|false Attribute options + * @param[in] $options array|false Attribute HTML options * @param[in] $name Attribute name * @param[in] $LSldapObject LSldapObject reference * @@ -379,23 +384,81 @@ class LSattr_html_select_list extends LSattr_html{ return $retInfos; } + /** + * Return array of possible values with translated labels (if enabled) + * by using specify callable + * + * @param[in] $options Attribute HTML options + * @param[in] $name Attribute name + * @param[in] &$ldapObject Related LSldapObject + * + * @author Benjamin Renard + * + * @retval array|false Associative array with possible values as key and corresponding + * translated label as value, or false in case of error. + */ + public static function getCallablePossibleValues($options, $name, &$ldapObject) { + // Handle get_possible_values parameter + $get_possible_values = LSconfig :: get('get_possible_values', null, null, $options); + if (!$get_possible_values) + return array(); + + // Check callable + if (!is_callable($get_possible_values)) { + LSerror :: addErrorCode('LSattr_html_select_list_06', $name); + return false; + } + + // Run callable + try { + $retInfos = call_user_func_array( + $get_possible_values, + array($options, $name, $ldapObject) + ); + } + catch (Exception $er) { + self :: log_exception($er, strval($this)." -> _getPossibleValues(): exception occured running ".format_callable($get_possible_values)); + $retInfos = null; + } + + // Check result + if (!is_array($retInfos)) { + LSerror :: addErrorCode( + 'LSattr_html_select_list_07', + array( + 'attr' => $name, + 'callable' => format_callable($get_possible_values) + ) + ); + return false; + } + + return $retInfos; + } + } /* * Error Codes */ LSerror :: defineError('LSattr_html_select_list_01', -___("LSattr_html_select_list : Configuration data are missing to generate the select list of the attribute %{attr}.") +___("LSattr_html_select_list: Configuration data are missing to generate the select list of the attribute %{attr}.") ); LSerror :: defineError('LSattr_html_select_list_02', -___("LSattr_html_select_list : Invalid attribute %{attr} reference as OTHER_ATTRIBUTE possible values.") +___("LSattr_html_select_list: Invalid attribute %{attr} reference as OTHER_ATTRIBUTE possible values.") ); LSerror :: defineError('LSattr_html_select_list_03', -___("LSattr_html_select_list : Attribute %{attr} referenced as OTHER_ATTRIBUTE possible values is not a jsonCompositeAttribute.") +___("LSattr_html_select_list: Attribute %{attr} referenced as OTHER_ATTRIBUTE possible values is not a jsonCompositeAttribute.") ); LSerror :: defineError('LSattr_html_select_list_04', -___("LSattr_html_select_list : Fail to decode the following attribute %{attr} value as JSON : %{value}") +___("LSattr_html_select_list: Fail to decode the following attribute %{attr} value as JSON : %{value}") ); LSerror :: defineError('LSattr_html_select_list_05', -___("LSattr_html_select_list : No component %{component} found in the following attribute %{attr} JSON value : %{value}") +___("LSattr_html_select_list: No component %{component} found in the following attribute %{attr} JSON value : %{value}") +); +LSerror :: defineError('LSattr_html_select_list_06', +___("LSattr_html_select_list: Invalid get_possible_values parameter found in configuration of attribute %{attr}: must be a callable.") +); +LSerror :: defineError('LSattr_html_select_list_07', +___("LSattr_html_select_list: fail to retreive possible values of attribute %{attr} using configured function %{callable}.") ); diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index 54f8a4d56d4a529fc1b546de884e3f265b707673..7df6033aeffdbef857ac355659f913d8f2929caa 100644 GIT binary patch delta 10438 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 Ee@4Hy(f|Me diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 89cfbfef..8e816da1 100644 --- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-09-21 15:46+0200\n" +"PO-Revision-Date: 2020-09-22 14:32+0200\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -2083,46 +2083,62 @@ msgstr "Discuter avec cette personne." msgid "%s (Unparsable value)" msgstr "%s (valeur non-analysable)" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:388 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:445 msgid "" -"LSattr_html_select_list : Configuration data are missing to generate the " +"LSattr_html_select_list: Configuration data are missing to generate the " "select list of the attribute %{attr}." msgstr "" "LSattr_html_select_list : Des données de configuration sont manquantes pour " "générer la liste de sélection de l'attribut %{attr}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:391 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:448 msgid "" -"LSattr_html_select_list : Invalid attribute %{attr} reference as " +"LSattr_html_select_list: Invalid attribute %{attr} reference as " "OTHER_ATTRIBUTE possible values." msgstr "" "LSattr_html_select_list : Référence invalide à l'attribut %{attr} comme " "valeurs possibles (OTHER_ATTRIBUTE)." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:394 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:451 msgid "" -"LSattr_html_select_list : Attribute %{attr} referenced as OTHER_ATTRIBUTE " +"LSattr_html_select_list: Attribute %{attr} referenced as OTHER_ATTRIBUTE " "possible values is not a jsonCompositeAttribute." msgstr "" "LSattr_html_select_list : L'attribute %{attr} référencé comme valeurs " "possibles (OTHER_ATTRIBUTE) n'est pas du type jsonCompositeAttribute." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:397 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:454 msgid "" -"LSattr_html_select_list : Fail to decode the following attribute %{attr} " +"LSattr_html_select_list: Fail to decode the following attribute %{attr} " "value as JSON : %{value}" msgstr "" "LSattr_html_select_list : Impossible de décodé la valeur JSON suivante de " "l'attribut %{attr} : %{value}" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:400 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:457 msgid "" -"LSattr_html_select_list : No component %{component} found in the following " +"LSattr_html_select_list: No component %{component} found in the following " "attribute %{attr} JSON value : %{value}" msgstr "" "LSattr_html_select_list : Le composant %{component} n'a pas été trouvé dans " "la valeur JSON de l'attribut %{attr} : %{value}" +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:460 +msgid "" +"LSattr_html_select_list: Invalid get_possible_values parameter found in " +"configuration of attribute %{attr}: must be a callable." +msgstr "" +"LSattr_html_select_list : Paramètre get_possible_values invalide trouvé dans " +"la configuration de l'attribut %{attr} : cela doit être un callable." + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:463 +msgid "" +"LSattr_html_select_list: fail to retreive possible values of attribute " +"%{attr} using configured function %{callable}." +msgstr "" +"LSattr_html_select_list : Impossible de récupérer les valeurs possibles de " +"l'attribut %{attr} en utilisant la fonction configurée %{callable}." + #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformRule_inarray.php:57 msgid "" "LSformRule_inarray : Possible values has not been configured to validate " diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot index f0ab5049..a0c6eafe 100644 --- a/src/lang/ldapsaisie.pot +++ b/src/lang/ldapsaisie.pot @@ -1765,36 +1765,48 @@ msgstr "" msgid "%s (Unparsable value)" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:388 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:445 msgid "" -"LSattr_html_select_list : Configuration data are missing to generate the " +"LSattr_html_select_list: Configuration data are missing to generate the " "select list of the attribute %{attr}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:391 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:448 msgid "" -"LSattr_html_select_list : Invalid attribute %{attr} reference as " +"LSattr_html_select_list: Invalid attribute %{attr} reference as " "OTHER_ATTRIBUTE possible values." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:394 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:451 msgid "" -"LSattr_html_select_list : Attribute %{attr} referenced as OTHER_ATTRIBUTE " +"LSattr_html_select_list: Attribute %{attr} referenced as OTHER_ATTRIBUTE " "possible values is not a jsonCompositeAttribute." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:397 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:454 msgid "" -"LSattr_html_select_list : Fail to decode the following attribute %{attr} " +"LSattr_html_select_list: Fail to decode the following attribute %{attr} " "value as JSON : %{value}" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:400 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:457 msgid "" -"LSattr_html_select_list : No component %{component} found in the following " +"LSattr_html_select_list: No component %{component} found in the following " "attribute %{attr} JSON value : %{value}" msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:460 +msgid "" +"LSattr_html_select_list: Invalid get_possible_values parameter found in " +"configuration of attribute %{attr}: must be a callable." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_html_select_list.php:463 +msgid "" +"LSattr_html_select_list: fail to retreive possible values of attribute " +"%{attr} using configured function %{callable}." +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformRule_inarray.php:57 msgid "" "LSformRule_inarray : Possible values has not been configured to validate "