nodebb-plugin-equipment-calendar 0.2.9 → 0.3.1

package/library.js

@@ -311,8 +311,8 @@ plugin.init = async function (params) {
 
   // Admin (ACP) routes
   if (mid && mid.admin) {
-    router.get('/admin/plugins/equipment-calendar', mid.admin.buildHeader, renderAdminPage);
-    router.get('/api/admin/plugins/equipment-calendar', renderAdminPage);
+    router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
+    router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
     router.post('/admin/plugins/equipment-calendar/save', middleware.applyCSRF, handleAdminSave);
   }
 
@@ -393,8 +393,8 @@ plugin.addAdminNavigation = async function (header) {
 // --- Admin page routes (ACP) ---
 plugin.addAdminRoutes = async function (params) {
   const { router, middleware: mid } = params;
-  router.get('/admin/plugins/equipment-calendar', mid.admin.buildHeader, renderAdminPage);
-  router.get('/api/admin/plugins/equipment-calendar', renderAdminPage);
+  router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
+  router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
 };
 
 async function renderAdminPage(req, res) {
@@ -402,6 +402,7 @@ async function renderAdminPage(req, res) {
   res.render('admin/plugins/equipment-calendar', {
     title: 'Equipment Calendar',
     settings,
+    saved: req.query && String(req.query.saved || '') === '1',
     view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',
     view_timeGridWeek: (settings.defaultView || '') === 'timeGridWeek',
     view_timeGridDay: (settings.defaultView || '') === 'timeGridDay',
@@ -488,7 +489,6 @@ async function renderCalendarPage(req, res) {
     eventsB64: Buffer.from(JSON.stringify(events), 'utf8').toString('base64'),
     blocksB64: Buffer.from(JSON.stringify(blocks), 'utf8').toString('base64'),
     itemsB64: Buffer.from(JSON.stringify(items.map(i => ({ id: i.id, name: i.name, location: i.location }))), 'utf8').toString('base64'),
-    csrf: req.csrfToken,
   });
 }
 
@@ -538,7 +538,6 @@ async function renderApprovalsPage(req, res) {
     title: 'Validation des réservations',
     rows,
     hasRows: Array.isArray(rows) && rows.length > 0,
-    csrf: req.csrfToken,
   });
 }
 
@@ -710,7 +709,7 @@ async function handleAdminSave(req, res) {
     };
 
     await meta.settings.set(SETTINGS_KEY, values);
-    return res.redirect('/admin/plugins/equipment-calendar');
+    return res.redirect('/admin/plugins/equipment-calendar?saved=1');
   } catch (e) {
     return res.status(500).send(e.message || 'error');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -26,6 +26,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "0.2.1",
+  "version": "0.2.4",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -75,8 +75,17 @@
     // show modal
     const modalEl = document.getElementById('ecReserveModal');
     if (!modalEl) return;
-    const modal = bootstrap ? bootstrap.Modal.getOrCreateInstance(modalEl) : null;
-    if (modal) modal.show();
+    if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
+      const modal = bootstrap.Modal.getOrCreateInstance(modalEl);
+      modal.show();
+    } else {
+      // Fallback: no bootstrap JS available, just submit directly if there is an available item
+      if (hasAny) {
+        if (confirm('Envoyer la demande de réservation pour cette plage ?')) {
+          form.submit();
+        }
+      }
+    }
   }
 
   function initCalendar() {

package/public/templates/admin/plugins/equipment-calendar.tpl

@@ -1,8 +1,22 @@
 <div class="acp-page-container">
   <h1>Equipment Calendar</h1>
 
-  <form method="post" action="/admin/plugins/equipment-calendar/save" class="mb-3">
-    <input type="hidden" name="_csrf" value="{csrf}">
+  {{{ if saved }}}
+  <div class="alert alert-success">Paramètres enregistrés.</div>
+  <script>
+  (function () {
+    try {
+      if (window.app && window.app.alertSuccess) {
+        window.app.alertSuccess('Paramètres enregistrés');
+      }
+    } catch (e) {}
+  }());
+  </script>
+  {{{ end }}}
+
+
+  <form id="ec-admin-form" method="post" action="/admin/plugins/equipment-calendar/save" class="mb-3">
+    <input type="hidden" name="_csrf" value="{config.csrf_token}">
 
     <div class="alert alert-warning">
       Le champ "Matériel" doit être un JSON valide (array). Exemple :
@@ -60,6 +74,25 @@
       <div class="mb-3"><label class="form-label">Timezone</label><input name="timezone" class="form-control" value="{settings.timezone}"></div>
     </div>
 
-    <button class="btn btn-primary" type="submit">Sauvegarder</button>
+    <button id="ec-save" class="btn btn-primary" type="button">Sauvegarder</button>
   </form>
 </div>
+
+<script>
+(function () {
+  function ready(fn){ if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', fn); else fn(); }
+  ready(function () {
+    var btn = document.getElementById('ec-save');
+    var form = document.getElementById('ec-admin-form');
+    if (!btn || !form) { return; }
+    btn.addEventListener('click', function () {
+      try {
+        form.submit();
+      } catch (e) {
+        console.error(e);
+        alert('Erreur lors de la soumission du formulaire (voir console).');
+      }
+    });
+  });
+}());
+</script>

package/public/templates/equipment-calendar/calendar.tpl

@@ -24,7 +24,7 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Fermer"></button>
         </div>
         <div class="modal-body">
-          <input type="hidden" name="_csrf" value="{csrf}">
+          <input type="hidden" name="_csrf" value="{config.csrf_token}">
           <input type="hidden" name="start" value="">
           <input type="hidden" name="end" value="">
 
@@ -61,7 +61,7 @@
   </div>
 </div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/6.1.19/index.global.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js"></script>
 <script src="/plugins/nodebb-plugin-equipment-calendar/js/client.js"></script>
 
 <script>