Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #27567 from lamrani002/messaginForUser

Browse Source 
New display style for list of events of user
This commit is contained in:
Laurent Destailleur
2024-01-26 04:10:15 +01:00
committed by GitHub
parent 7cef1a6e00 ce2a606d28
commit ed8b939d8f
3 changed files with 247 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/lib/functions.lib.php
View File

@@ -12826,7 +12826,11 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
$force_filter_contact = false;
if (get_class($filterobj) !== 'User') {
$force_filter_contact = false;
} else {
$force_filter_contact = true;
}
if (is_object($objcon) && $objcon->id > 0) {
$force_filter_contact = true;
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
@@ -12891,6 +12895,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
$sql .= " AND a.fk_element = ".((int) $filterobj->id);
}
}
} else {
$sql .= " AND u.rowid = ". ((int) $filterobj->id);
}
// Condition on actioncode
@@ -13080,8 +13086,10 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
} else {
$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
}
if ($filterobj && get_class($filterobj) == 'Societe') {
if (($filterobj && get_class($filterobj) == 'Societe')) {
$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
} else {
$out .= '<input type="hidden" name="userid" value="'.$filterobj->id.'" />';
}
$out .= "\n";
@@ -13139,6 +13147,9 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
if (get_class($filterobj) == 'Societe') {
$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';
}
if (get_class($filterobj) == 'User') {
$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';
}
$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
@@ -13146,6 +13157,9 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
if (get_class($filterobj) == 'Societe') {
$tmp .= '</a>';
}
if (get_class($filterobj) == 'User') {
$tmp .= '</a>';
}
$out .= getTitleFieldOfList($tmp);
}