diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 6b6e3a6134f..eb062da6f60 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -91,7 +91,7 @@ if ($socid < 0) { $socid = ''; } -$canedit = 1; +$canedit = 1; // can read events of others if (!$user->hasRight('agenda', 'myactions', 'read')) { accessforbidden(); } @@ -1499,6 +1499,7 @@ $link = ''; // Show div with list of calendars print $s; +// Top filters print '
'; print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, '', (string) $filtert, '', $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid, $search_categ_cus); print '
'; @@ -1543,13 +1544,13 @@ while ($currentdaytoshow < $lastdaytoshow) { print $langs->trans("DaysOfWeek").''; print "\n"; print '
'; - print ''; + print ''; if (empty($conf->dol_use_jmobile)) { print ' - '; } else { print '
'; } - print ''; + print ''; print '
'; } @@ -1582,13 +1583,13 @@ while ($currentdaytoshow < $lastdaytoshow) { print $langs->trans("Hours").''; print "\n"; print '
'; - print ''; + print ''; if (empty($conf->dol_use_jmobile)) { print ' - '; } else { print '
'; } - print ''; + print ''; if (empty($conf->dol_use_jmobile)) { print ' '.$langs->trans("HourShort"); } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 49a7f816320..6634647cd93 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2140,7 +2140,7 @@ class Form * @param int<0,1>|string $show_empty 0=list with no empty value, 1=add also an empty value into list * @param int[]|null $exclude Array list of users id to exclude * @param int $disabled If select list must be disabled - * @param int[]|''|'hierarchy'|'hierarchyme' $include Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me + * @param int[]|''|'hierarchy'|'hierarchyme' $include Array list of users id to include. Use '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me * @param int[]|'' $enableonly Array list of users id to be enabled. If defined, it means that others will be disabled * @param string $force_entity '0' or list of Ids of environment to force, separated by a comma, or 'default' = do no extend to all entities allowed to superadmin. * @param int $maxlength Maximum length of string into list (0=no limit) @@ -2173,22 +2173,33 @@ class Form $selected = array($selected); } + // Exclude some users in $excludeUsers string $excludeUsers = null; - $includeUsers = null; - - // Exclude some users if (is_array($exclude)) { $excludeUsers = implode(",", $exclude); } - // Include some uses + + // Include some users in $includeUsers string + $includeUsers = null; + $includeUsersArray = array(); if (is_array($include)) { - $includeUsers = implode(",", $include); + $includeUsersArray = $include; } elseif ($include == 'hierarchy') { - // Build list includeUsers to have only hierarchy - $includeUsers = implode(",", $user->getAllChildIds(0)); + // Build list includeUsersArray to have only hierarchy + $includeUsersArray = $user->getAllChildIds(0); } elseif ($include == 'hierarchyme') { - // Build list includeUsers to have only hierarchy and current user - $includeUsers = implode(",", $user->getAllChildIds(1)); + // Build list includeUsersArray to have only hierarchy and current user + $includeUsersArray = $user->getAllChildIds(1); + } + // Get list of allowed users + if (!$user->hasRight('user', 'user', 'lire')) { + if (empty($includeUsersArray)) { + $includeUsers = implode(",", $user->getAllChildIds(1)); + } else { + $includeUsers = implode(",", array_intersect($includeUsersArray, $user->getAllChildIds(1))); + } + } else { + $includeUsers = implode(",", $includeUsersArray); } $num = 0; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index c956704492a..2587926c213 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -542,6 +542,9 @@ input.buttonpayment, button.buttonpayment, div.buttonpayment { input.short { width: 40px; } +input.shortbis { + width: 48px; +} .nofocusvisible:focus-visible { outline: none; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 13cd736b7ca..306b390db52 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -668,9 +668,13 @@ input, select { input.button.massactionconfirmed { margin: 4px; } + input.short { width: 40px; } +input.shortbis { + width: 48px; +} input:invalid, select:invalid, input.--error , select.--error { border-color: #ea1212;