From ab742e7bd8eacfe57e7be4dcd720988d9cbef5da Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Thu, 3 Apr 2025 14:58:41 +0200 Subject: [PATCH] NEW Support of monthly or weekly recurring events --- htdocs/comm/action/card.php | 8 ++++---- htdocs/core/lib/functions.lib.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index a7e6424cf81..ae530b3b3a3 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -543,7 +543,7 @@ if (empty($reshook) && $action == 'add' && $usercancreate) { // Is event recurrent ? $eventisrecurring = 0; - $userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0); + $userepeatevent = (getDolGlobalInt('MAIN_DISABLE_RECURRING_EVENTS') ? 0 : 1); if ($userepeatevent && !empty($selectedrecurrulefreq) && $selectedrecurrulefreq != 'no') { $eventisrecurring = 1; $object->recurid = dol_print_date(dol_now('gmt'), 'dayhourlog', 'gmt'); @@ -1452,7 +1452,7 @@ if ($action == 'create') { print ''; // Recurring event - $userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0); + $userepeatevent = (getDolGlobalInt('MAIN_DISABLE_RECURRING_EVENTS') ? 0 : 1); if ($userepeatevent) { print ''; @@ -1481,7 +1481,7 @@ if ($action == 'create') { $selectedrecurrulebyday = (int) $reg[1]; } - print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly'); + print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly minwidth100'); // print ''; // For recursive event @@ -2087,7 +2087,7 @@ if ($id > 0) { print ''; // // Recurring event - // $userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 2 ? 1 : 0); + // $userepeatevent = (getDolGlobalInt('MAIN_DISABLE_RECURRING_EVENTS') ? 0 : 1); // if ($userepeatevent) { // // Repeat // //print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1aa7b2cc02d..c5451c088eb 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6832,7 +6832,7 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '', do { if ($pagenavastextinput) { if ($cpt == $page) { - $pagelist .= ''; + $pagelist .= ''; $pagelist .= '/'; } } else {