|
@@ -111,7 +111,7 @@ if ($id > 0 || !empty($ref)) {
|
|
|
}
|
|
|
$object->info($object->id);
|
|
|
}
|
|
|
-$agenda = (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
|
|
|
+$agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/'.$langs->trans("Agenda") : '';
|
|
|
$title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
|
|
|
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
|
|
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
|
|
@@ -197,7 +197,7 @@ if (!empty($object->id)) {
|
|
|
|
|
|
// Show link to add event
|
|
|
if (isModEnabled('agenda')) {
|
|
|
- $addActionBtnRight = !empty($user->rights->agenda->myactions->create) || $user->hasRight('agenda', 'allactions', 'create');
|
|
|
+ $addActionBtnRight = $user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create');
|
|
|
$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
|
|
|
}
|
|
|
|