[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] Revert "[FIX] Fix: Ensure that the calendar module and plugin return the...

franck franck kalunga pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki


Commits:
bf7ab168 by franck franck kalunga at 2025-11-20T18:41:29+00:00
Revert "[FIX] Fix: Ensure that the calendar module and plugin return the...
---
* Revert "[FIX] Fix: Ensure that the calendar module and plugin return the correct URL after saving an event"

This reverts merge request !9072

See merge request tikiwiki/tiki!9074

- - - - -


10 changed files:

- lib/core/Services/Calendar/Controller.php
- lib/wiki-plugins/wikiplugin_calendar.php
- modules/mod-func-calendar_new.php
- src/js/jquery-tiki/tiki-calendar.js
- templates/calendar/edit_item.tpl
- − templates/calendar_header.tpl
- templates/modules/mod-calendar_new.tpl
- templates/wiki-plugins/wikiplugin_calendar.tpl
- tiki-calendar.php
- tiki-setup.php


Changes:

=====================================
lib/core/Services/Calendar/Controller.php
=====================================
@@ -434,7 +434,6 @@ class Services_Calendar_Controller extends Services_Calendar_BaseController
                 'allday'                => $calendar['allday'] == 'y' ? 1 : 0,
                 'organizers'            => [$user],
                 'participants'          => $participants,
-                'returnURL'             => $return_url,
             ];
         }
 


=====================================
lib/wiki-plugins/wikiplugin_calendar.php
=====================================
@@ -80,7 +80,8 @@ function wikiplugin_calendar_info()
 
 function wikiplugin_calendar($data, $params)
 {
-    global $prefs, $tiki_p_admin, $tiki_p_view_calendar, $base_uri;
+    global $prefs, $tiki_p_admin, $tiki_p_view_calendar, $tikiroot;
+    global $dc, $user;
 
     $smarty = TikiLib::lib('smarty');
     $tikilib = TikiLib::lib('tiki');
@@ -123,8 +124,6 @@ function wikiplugin_calendar($data, $params)
     $calendarInitialParams = $calendarlib->generalParamsOfCalendar($rawcals['data']);
     $calendarInitialParams['initialView'] = $initialView;
     $calendars = $calendarInitialParams['calendars'];
-    $current_url = $base_uri;
-    $smarty->assign('returnURL', $current_url);
     $smarty->assign(
         'fullCalendarParams',
         $calendarInitialParams


=====================================
modules/mod-func-calendar_new.php
=====================================
@@ -73,7 +73,7 @@ function module_calendar_new_info()
  */
 function module_calendar_new($mod_reference, $module_params)
 {
-    global $prefs, $user, $tiki_p_admin_calendars, $base_uri;
+    global $prefs, $user, $tiki_p_admin_calendars;
     $tikilib = TikiLib::lib('tiki');
     $smarty = TikiLib::lib('smarty');
     $calendarlib = TikiLib::lib('calendar');
@@ -81,7 +81,7 @@ function module_calendar_new($mod_reference, $module_params)
     global $calendarViewMode, $focusdate;
     $default = ['viewnavbar' => 'y', 'viewmode' => 'month', 'showaction' => 'y'];
     $module_params = array_merge($default, $module_params);
-    $defaultCalendarId = 0;
+
     if (isset($_REQUEST['viewmode'])) {
         $save_viewmode = $_REQUEST['viewmode'];
     }
@@ -155,9 +155,6 @@ function module_calendar_new($mod_reference, $module_params)
         'fullCalendarParams',
         $calendarInitialParams
     );
-
-    $current_url = $base_uri;
-    $smarty->assign('returnURL', $current_url);
     $smarty->assign('moduleCalendarFocusdate', $moduleCalendarFocusdate);
     $smarty->assign('moduleCalendarIds', $moduleCalendarIds);
     $canEditAnything = $calendarInitialParams['canEditAnything'] ? 'y' : 'n';


=====================================
src/js/jquery-tiki/tiki-calendar.js
=====================================
@@ -11,8 +11,7 @@ $.fn.setupFullCalendar = function (
     fullCalendarParams,
     calendarContainer,
     targetId = "calendar",
-    urlEventSource = "tiki-ajax_services.php?controller=calendar&action=list_items",
-    returnUrl = "tiki-calendar.php"
+    urlEventSource = "tiki-ajax_services.php?controller=calendar&action=list_items"
 ) {
     this.each(function () {
         const calendarEl = document.getElementById(targetId);
@@ -228,7 +227,7 @@ $.fn.setupFullCalendar = function (
                         $.openModal({
                             title: tr("New event"),
                             size: "modal-lg",
-                            remote: $.service("calendar", "edit_item", { todate: info.date.toUnix(), modal: 1, return_url: returnUrl }),
+                            remote: $.service("calendar", "edit_item", { todate: info.date.toUnix(), modal: 1 }),
                             open: function () {
                                 $this.tikiModal();
                                 $("form:not(.no-ajax)", this).addClass("no-ajax"); // Remove default ajax handling, we replace it


=====================================
templates/calendar/edit_item.tpl
=====================================
@@ -19,7 +19,7 @@
                 {/if}
             </div>
             <input type="hidden" name="calitem[user]" value="{$calitem.user|escape}">
-            <input type="hidden" id="return_url" name="return_url" value="{$calitem.returnURL}">
+            <input type="hidden" name="return_url" value="tiki-calendar.php">
             {if $calitemId}
                 <input type="hidden" name="calitemId" value="{$calitemId|escape}">
             {/if}
@@ -38,7 +38,8 @@
                 <label for="calid" class="col-form-label col-sm-3">{tr}Calendar{/tr}</label>
                 <div class="col-sm-9">
                     <input name="calendarchanged" type="hidden">
-                    <select name="calitem[calendarId]" id="calid" class="form-control" required>
+                    <select name="calitem[calendarId]" id="calid" class="form-control" required
+                            onchange="$(this).parents('.edit-event-form').tikiModal(tr('Loading...')); needToConfirm=false; $('input[name=calendarchanged]').val(1); $('input[name=saveitem]').trigger('click');">
                         {foreach $calendars as $aCalendar}
                             {$calstyle = ''}
                             {if not empty($aCalendar.custombgcolor)}


=====================================
templates/calendar_header.tpl deleted
=====================================
@@ -1,34 +0,0 @@
-{if $tiki_p_admin_calendar eq 'y' or $tiki_p_admin eq 'y'}
-    {if $displayedcals|@count eq 1}
-        {if $displayedcals[0]|substr:0:1 eq 's'}
-            {button href="tiki-admin_calendars.php?subscriptionId={$displayedcals[0]|substr:1}&cookietab=3" _type="link" _text="{tr}Edit{/tr}" _icon_name="edit"}
-        {else}
-            {button href="tiki-admin_calendars.php?calendarId={$displayedcals[0]}&cookietab=2" _type="link" _text="{tr}Edit{/tr}" _icon_name="edit"}
-        {/if}
-    {/if}
-    {button href="tiki-admin_calendars.php?cookietab=1" _type="link" _text="{tr}Admin{/tr}" _icon_name="admin"}
-{elseif $tiki_p_admin_private_calendar eq 'y'}
-    {button href="tiki-admin_calendars.php?cookietab=1" _type="link" _text="{tr}Admin{/tr}" _icon_name="admin"}
-{/if}
-
-{* avoid Add Event being shown if no calendar is displayed *}
-{if $tiki_p_add_events eq 'y'}
-    <a {if $isInMainCalendar eq 'y'} style="display:block;"{/if} href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId returnURL=$returnURL}" class="btn btn-primary mt-2">{icon name='create'} {tr}Add Event{/tr}</a>
-{/if}
-
-{if $viewlist eq 'list'}
-    {capture name=href}?viewlist=table{if !empty($smarty.request.todate)}&amp;todate={$smarty.request.todate}{/if}{/capture}
-    {if $isInMainCalendar eq 'y'}
-        {button _style="display: block;" _class="mt-2" href=$smarty.capture.href _text='{tr}Calendar View{/tr}' _icon_name='calendar' _type='info'}
-    {else}
-        {button _class="mt-2" href=$smarty.capture.href _text='{tr}Calendar View{/tr}' _icon_name='calendar' _type='info'}
-    {/if}
-{elseif $viewlist eq 'listEventView'}
-    {button _class="mt-2" href='tiki-calendar.php' _text='{tr}List View{/tr}' _icon_name='list' _type='info'}
-{else}
-    {capture name=href}?viewlist=list{if !empty($smarty.request.todate)}&amp;todate={$smarty.request.todate}{/if}{/capture}
-    
-    {if $isInMainCalendar neq 'y'}
-        {button _class="mt-2" href=$smarty.capture.href _text='{tr}List View{/tr}' _icon_name='list' _type='info'} 
-    {/if}
-{/if}


=====================================
templates/modules/mod-calendar_new.tpl
=====================================
@@ -3,7 +3,7 @@
         {if $tiki_p_add_events eq 'y' && (empty($module_params.showaction) && $canEditAnything eq 'y' || $module_params.showaction ne 'n')}
             <br>
             <p>
-                <a href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId return_url=$returnURL}" class="btn btn-primary">{icon name='create'} {tr}Add Event{/tr}</a>
+                <a href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId}" class="btn btn-primary">{icon name='create'} {tr}Add Event{/tr}</a>
             </p>
         {/if}
         {if $viewlist eq 'list'}
@@ -21,15 +21,13 @@
                         let paramOfModuleCalendar = {{$fullCalendarParams|json_encode}};
                         const moduleCalendarFocusDate = document.getElementById('date-module-calendar');
                         paramOfModuleCalendar['initialDate'] = $('#date-module-calendar').val();
-                        let returnUrl = ('{{$returnURL}}');
-                        returnUrl = returnUrl.toString();
 
                         const calendarContainer = [window.moduleCalendar];
-                        $("#module-calendar").setupFullCalendar({{$fullCalendarParams|json_encode}}, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}', returnUrl);
+                        $("#module-calendar").setupFullCalendar(paramOfModuleCalendar, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}');
                         moduleCalendarFocusDate.addEventListener('change', () => {
                             document.getElementById('module-calendar').innerHTML = "";
                             paramOfModuleCalendar['initialDate'] = $('#date-module-calendar').val();
-                            $("#module-calendar").setupFullCalendar(paramOfModuleCalendar, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}', returnUrl);
+                            $("#module-calendar").setupFullCalendar(paramOfModuleCalendar, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}');
                         })
                         {{if $prefs.print_pdf_from_url neq 'none'}$("#module-calendar").addEventCalendarPrint('#module-calendar-pdf-btn', calendarContainer[0]);{/if}}
                     {/jq}


=====================================
templates/wiki-plugins/wikiplugin_calendar.tpl
=====================================
@@ -1,6 +1,6 @@
 <div class="border border-secondary p-2">
     {if $tiki_p_add_events eq 'y' and $viewlist neq 'list'}
-        <a href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId return_url=$returnURL}" class="btn btn-primary">{icon name='create'} {tr}Add Event{/tr}</a>
+        <a href="{bootstrap_modal controller='calendar' action='edit_item' size='modal-lg' defaultCalendarId=$defaultCalendarId}" class="btn btn-primary">{icon name='create'} {tr}Add Event{/tr}</a>
     {/if}
     {if count($calendars) >= 1 && $viewnavbar eq 'y'}
         {include file="export_calendar_in_csv_or_ical.tpl"}
@@ -11,14 +11,12 @@
             let content = {{$fullCalendarParams|json_encode}};
             const elt = document.getElementById('date-plugin-calendar');
             content['initialDate'] = $('#date-plugin-calendar').val();
-            const wikipluginCalendar = [window.pluginCalendar];
-            let returnUrlForPlugin = ('{{$returnURL}}');
-            returnUrlForPlugin = returnUrlForPlugin.toString();
-            $("#plugin-calendar").setupFullCalendar(content,  wikipluginCalendar, 'plugin-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$pluginCalendarIds}}', returnUrlForPlugin);
+            const wikipluginCalendar = [window.pluginCalendar]
+            $("#plugin-calendar").setupFullCalendar(content,  wikipluginCalendar, 'plugin-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$pluginCalendarIds}}');
             elt.addEventListener('change', () => {
                 document.getElementById('plugin-calendar').innerHTML = "";
                 content['initialDate'] = $('#date-plugin-calendar').val();
-                $("#plugin-calendar").setupFullCalendar(content,  wikipluginCalendar, 'plugin-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$pluginCalendarIds}}', returnUrlForPlugin);
+                $("#plugin-calendar").setupFullCalendar(content,  wikipluginCalendar, 'plugin-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$pluginCalendarIds}}');
             })
             {{if $prefs.print_pdf_from_url neq 'none'}$("#plugin-calendar").addEventCalendarPrint('#calendar-pdf-btn', wikipluginCalendar[0]);{/if}}
         {/jq}
@@ -53,6 +51,7 @@
     {if $viewlist neq 'list'}
     <input type="date" value="{$focusdate}" id="date-plugin-calendar">
     {/if}
+
     <div id='plugin-calendar'></div>
     {if $viewlist eq 'list'}
         {$out}


=====================================
tiki-calendar.php
=====================================
@@ -175,9 +175,6 @@ if (! empty($_REQUEST["calitemId"])) {
 } else {
     $calitemId = '';
 }
-global $base_uri;
-$current_url = $base_uri;
-$smarty->assign('returnURL', $current_url);
 $smarty->assign('currentcalitemId', $calitemId);
 
 $smarty->assign('displayedcals', $_SESSION['CalendarViewGroups']);


=====================================
tiki-setup.php
=====================================
@@ -994,8 +994,6 @@ if ($prefs['feature_realtime'] == 'y') {
 if ($prefs['feature_calendar'] === 'y') {
     $headerlib->add_js_module('import "@jquery-tiki/tiki-calendar";');
     $headerlib->add_js_module('import "@jquery-tiki/fullcalendar_to_pdf";');
-    $headerlib->add_cssfile('themes/base_files/feature_css/calendar.css', 20);
-    $headerlib->add_jsfile('lib/jquery_tiki/tiki-calendar_edit_item.js');
 }
 
 // Using boomerang for performance monitoring



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/bf7ab1682c944cc01446eeb8c31b0c64de21818e

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/bf7ab1682c944cc01446eeb8c31b0c64de21818e
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs