lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-31 05:02:26 +01:00
parent 6c02e890d8
commit 16ca0ab801
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent_type.class.php
View File

@ -626,7 +626,7 @@ class AdherentType extends CommonObject
$sql .= ' AND ('.$excludefilter.')'; $sql .= ' AND ('.$excludefilter.')';
} }
dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG); dol_syslog(get_class($this)."::listMembersForMemberType", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
while ($obj = $this->db->fetch_object($resql)) { while ($obj = $this->db->fetch_object($resql)) {

20
htdocs/comm/action/peruser.php
View File

@ -946,26 +946,6 @@ while ($currentdaytoshow < $lastdaytoshow) {
$usernames[] = $tmpuser; $usernames[] = $tmpuser;
} }
/*
if ($filtert > 0)
{
$tmpuser = new User($db);
$tmpuser->fetch($filtert);
$usernames[] = $tmpuser;
}
else if ($usergroup)
{
$tmpgroup = new UserGroup($db);
$tmpgroup->fetch($usergroup);
$usernames = $tmpgroup->listUsersForGroup();
}
else
{
$tmpgroup = new UserGroup($db);
//$tmpgroup->fetch($usergroup); No fetch, we want all users for all groups
$usernames = $tmpgroup->listUsersForGroup();
}*/
// Load array of colors by type // Load array of colors by type
$colorsbytype = array(); $colorsbytype = array();
$labelbytype = array(); $labelbytype = array();

2
htdocs/holiday/list.php
View File

@ -607,7 +607,7 @@ if ($resql) {
print '<td class="liste_titre maxwidthonsmartphone left">'; print '<td class="liste_titre maxwidthonsmartphone left">';
$validator = new UserGroup($db); $validator = new UserGroup($db);
$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id; $excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
$valideurobjects = $validator->listUsersForGroup($excludefilter); $valideurobjects = $validator->listUsersForGroup($excludefilter, 1);
$valideurarray = array(); $valideurarray = array();
foreach ($valideurobjects as $val) { foreach ($valideurobjects as $val) {
$valideurarray[$val->id] = $val->id; $valideurarray[$val->id] = $val->id;

3
htdocs/holiday/view_log.php
View File

@ -333,9 +333,8 @@ if (!empty($arrayfields['cpl.date_action']['checked'])) {
if (!empty($arrayfields['cpl.fk_user_action']['checked'])) { if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
$validator = new UserGroup($db); $validator = new UserGroup($db);
$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id; $excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
$valideurobjects = $validator->listUsersForGroup($excludefilter); $valideurobjects = $validator->listUsersForGroup($excludefilter, 1);
$valideurarray = array(); $valideurarray = array();
foreach ($valideurobjects as $val) { foreach ($valideurobjects as $val) {
$valideurarray[$val->id] = $val->id; $valideurarray[$val->id] = $val->id;
} }