diff --git a/doc/conf/LSobject.docbook b/doc/conf/LSobject.docbook index eb5ed4fe..60496e7d 100644 --- a/doc/conf/LSobject.docbook +++ b/doc/conf/LSobject.docbook @@ -52,6 +52,11 @@ // Configuration des formulaires de l'objet ), // fin LSform + // LSsearch + 'LSsearch' => array ( + // Configuration des recherches de l'objet + ), // fin LSsearch + // Attributs 'attrs' => array ( // Configuration des attributs du type d'LSobjet diff --git a/doc/conf/LSobject/LSsearch.docbook b/doc/conf/LSobject/LSsearch.docbook index 700bfc35..3a2eb17a 100644 --- a/doc/conf/LSobject/LSsearch.docbook +++ b/doc/conf/LSobject/LSsearch.docbook @@ -14,7 +14,7 @@ configuration des &LSobjects;, dans la variable LSsearch 'attr2', ... ), - ... + 'recursive' => [booléen] );]]> @@ -41,6 +41,14 @@ configuration des &LSobjects;, dans la variable LSsearch + + recursive + + Booléen déterminant si la recherche récursive est activée ou non par + défaut pour ce type d'LSobject. + + + diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php index fa5504eb..c104c959 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php @@ -114,7 +114,8 @@ $GLOBALS['LSobjects']['LSeepeople'] = array ( 'cn', 'uid', 'mail' - ) + ), + 'recursive' => true ), // Attributes diff --git a/trunk/css/black/base.css b/trunk/css/black/base.css index c85f0948..f2e91b7d 100644 --- a/trunk/css/black/base.css +++ b/trunk/css/black/base.css @@ -228,6 +228,14 @@ strong.LSobject-list-page { color: #433f3a; } +#LSobject_list_nbresult { + float: right; + color: #333; + font-style: italic; + margin-right: 20px; + text-transform: lowercase; +} + /* ******************* * LSview-actions diff --git a/trunk/css/default/base.css b/trunk/css/default/base.css index 25da785f..59516cad 100644 --- a/trunk/css/default/base.css +++ b/trunk/css/default/base.css @@ -226,6 +226,14 @@ strong.LSobject-list-page { color: #0072b8; } +#LSobject_list_nbresult { + float: right; + color: #333; + font-style: italic; + margin-right: 20px; + text-transform: lowercase; +} + /* ******************* * LSview-actions diff --git a/trunk/select.php b/trunk/select.php index fa468834..311ac7ec 100644 --- a/trunk/select.php +++ b/trunk/select.php @@ -61,7 +61,7 @@ if(LSsession :: startLSsession()) { $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn(); $params = array('scope' => 'one'); $pattern = false; - $recur = false; + $recur = LSconfig :: get("LSobjects.$LSobject.LSsearch.recursive"); $approx = false; $selectedTopDn = LSsession :: getTopDn(); $orderby = false; diff --git a/trunk/templates/default/viewList.tpl b/trunk/templates/default/viewList.tpl index a24acce3..3b4be1ea 100644 --- a/trunk/templates/default/viewList.tpl +++ b/trunk/templates/default/viewList.tpl @@ -49,6 +49,7 @@ {/foreach} + {$LSobject_list_nbresult} {$pagetitle} {if $LSobject_list_nbpage}

{section name=listpage loop=$LSobject_list_nbpage step=1} diff --git a/trunk/view.php b/trunk/view.php index a84417c9..29d92fe7 100644 --- a/trunk/view.php +++ b/trunk/view.php @@ -116,7 +116,7 @@ if(LSsession :: startLSsession()) { $topDn = $object -> config['container_dn'].','.LSsession :: getTopDn(); $params = array('scope' => 'one'); $pattern = false; - $recur = false; + $recur = LSconfig :: get("LSobjects.$LSobject.LSsearch.recursive"); $approx = false; $orderby = false; $_REQUEST['orderby']=LSconfig :: get("LSobjects.$LSobject.orderby");