nodebb-plugin-onekite-calendar 2.0.47 → 2.0.48

package/lib/api.js

@@ -1050,7 +1050,11 @@ api.createOuting = async function (req, res) {
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
   const startTs = toTs(req.body && req.body.start);
-  const ok = await canRequest(req.uid, settings, startTs);
+  // Permissions for outings must match reservations/locations rights.
+  // We intentionally base the "auto" yearly group on the *current* year,
+  // not on the outing date, so members can plan future outings without
+  // requiring next-year group membership.
+  const ok = await canRequest(req.uid, settings, Date.now());
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const title = String((req.body && req.body.title) || '').trim() || 'Sortie';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.47",
+  "version": "2.0.48",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.47"
+  "version": "2.0.48"
 }

package/public/client.js

@@ -1494,12 +1494,13 @@ function toDatetimeLocalValue(date) {
             }
           } catch (e) {}
 
-          // IMPORTANT: align "special" event display exactly like reservation icons.
+          // IMPORTANT: align "special" events and "outings" display exactly like
+          // reservation icons.
           // We inject the clock + time range directly into the event title so FC
           // doesn't reserve a separate time column (which creates a leading gap).
           const mapped = (Array.isArray(data) ? data : []).map((ev) => {
             try {
-              if (ev && ev.extendedProps && ev.extendedProps.type === 'special' && ev.start && ev.end) {
+              if (ev && ev.extendedProps && (ev.extendedProps.type === 'special' || ev.extendedProps.type === 'outing') && ev.start && ev.end) {
                 // Force the same visual layout as reservations in month view
                 // (avoid the "dot" layout which introduces a leading gap).
                 ev.display = 'block';
@@ -1525,15 +1526,18 @@ function toDatetimeLocalValue(date) {
         }
       },
       eventDidMount: function (arg) {
-        // Keep special event colors consistent.
+        // Keep special event + outing colors consistent even if a theme overrides
+        // FullCalendar defaults.
         try {
           const ev = arg && arg.event;
           if (!ev) return;
-          if (ev.extendedProps && ev.extendedProps.type === 'special') {
+          const t = ev.extendedProps && ev.extendedProps.type;
+          if (t === 'special' || t === 'outing') {
             const el2 = arg.el;
             if (el2 && el2.style) {
-              el2.style.backgroundColor = '#8e44ad';
-              el2.style.borderColor = '#8e44ad';
+              const bg = (t === 'outing') ? '#2980b9' : '#8e44ad';
+              el2.style.backgroundColor = bg;
+              el2.style.borderColor = bg;
               el2.style.color = '#ffffff';
             }
           }