nodebb-plugin-equipment-calendar 9.0.7 → 9.0.9

package/library.js

@@ -187,12 +187,8 @@ async function setSettings(payload) {
   Object.keys(payload || {}).forEach((k) => {
     sets[k] = JSON.stringify(payload[k]);
   });
-  await setSettings(payload);
+  await meta.settings.set('equipmentCalendar', sets);
 }
-
-
-
-
 function parseLocationMap(locationMapJson) {
   try {
     const obj = JSON.parse(locationMapJson || '{}');
@@ -1606,6 +1602,7 @@ async function handleAdminSave(req, res) {
       ha_clientSecret: String(req.body.ha_clientSecret || ''),
       ha_organizationSlug: String(req.body.ha_organizationSlug || ''),
       ha_returnUrl: String(req.body.ha_returnUrl || ''),
+      ha_apiBaseUrl: String(req.body.ha_apiBaseUrl || DEFAULT_SETTINGS.ha_apiBaseUrl),
       ha_webhookSecret: String(req.body.ha_webhookSecret || ''),
       defaultView: String(req.body.defaultView || DEFAULT_SETTINGS.defaultView),
       timezone: String(req.body.timezone || DEFAULT_SETTINGS.timezone),
@@ -1613,8 +1610,8 @@ async function handleAdminSave(req, res) {
       showRequesterToAll: (req.body.showRequesterToAll === '1' || req.body.showRequesterToAll === 'on') ? '1' : '0',
     };
 
-    await setSettings(payload);
-return res.redirect('/admin/plugins/equipment-calendar?saved=1');
+    await setSettings(values);
+return res.redirect(nconf.get('relative_path') + '/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": "9.0.7",
+  "version": "9.0.9",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,7 +25,7 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable4u-official-acp",
+  "version": "3.0.0-stable4w-fix-admin-save",
   "minver": "4.7.1",
   "acpScripts": [
     "public/js/admin.js"

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

@@ -2,7 +2,7 @@
 <div class="acp-page-container">
   <h1 class="mb-3">Equipment Calendar</h1>
 
-  <form role="form" class="equipment-calendar-settings">
+  <div class="equipment-calendar-settings">
     <div class="card card-body mb-3">
       <h5 class="mb-3">Permissions</h5>
       <div class="mb-3">
@@ -64,7 +64,7 @@
     </div>
 
     <button id="save" type="button" class="btn btn-primary">Enregistrer</button>
-  </form>
+  </div>
 </div>
 
 <script>