Fix multiselect field type, bug fixes

Author: faisalnjs

README.md

@@ -288,7 +288,7 @@ The tenant `customText` configuration allows you to override default text string
   "userWelcomeBefore": "Welcome, ",
   "userWelcomeAfter": "!",
   "activationTitle": "Activation",
-  "sessionTitle": "Session",
+  "sessionTitle": "Enable Cookies",
   "tenantTitle": "Configuration",
   "authTitle": "Authentication Required",
   "authDescriptionBefore": "You'll need to log into your ",

frontend/pages/edit.ejs

@@ -136,13 +136,15 @@
 		</tr>
 	</tbody>
 </table>
+<% if (!vars.disableFieldEditing.includes('sendEmail')) { %>
 <div class="inputField active" id="sendEmail">
 	<h3><%= tenant.customText?.labelSendEmail %></h3>
 	<p><%= tenant.customText?.labelSendEmailDescription %></p>
 	<input id="sendEmailInput" type="checkbox" class="hidden">
 	<div class="checkbox">|||</div>
 </div>
 <% } %>
+<% } %>
 <div class="buttons">
 	<% if (!commission.locked || (role !== 'user')) { %><div id="save" class="button"><%= tenant.customText?.saveLabel %></div><% } %>
 	<a id="error" class="button active hidden" href="<%= tenant.domain %><%= tenant.path %>/<%= commission.id %>/edit"><%= tenant.customText?.restartLabel %></a>

frontend/pages/session.ejs

@@ -0,0 +1,5 @@
+<%- include('head.ejs') %>
+<img src="<%= tenant.logo %>" alt="<%= tenant.name %>">
+<h1><%= tenant.customText?.sessionTitle %></h1>
+<p><%= tenant.customText?.noSession %></p>
+<%- include('foot.ejs') %>

frontend/public/scripts.js

@@ -59,7 +59,13 @@ window.onload = function () {
             });
             field.querySelectorAll('select').forEach(select => {
                 if (pathStorage[field.id]) {
-                    select.value = pathStorage[field.id];
+                    if (Array.isArray(pathStorage[field.id]) && select.multiple) {
+                        Array.from(select.options).forEach(option => {
+                            option.selected = pathStorage[field.id].includes(option.value);
+                        });
+                    } else {
+                        select.value = pathStorage[field.id];
+                    };
                 };
             });
         });
@@ -104,6 +110,10 @@ window.onload = function () {
                                 radio.checked = true;
                             };
                         });
+                    } else if ((input.tagName.toLowerCase() === 'select') && input.multiple && Array.isArray(restore[key])) {
+                        Array.from(input.options).forEach(option => {
+                            option.selected = restore[key].includes(option.value);
+                        });
                     } else {
                         input.value = restore[key];
                     };
@@ -294,6 +304,8 @@ async function create() {
                 radios.forEach(radio => {
                     if (radio.checked) data[field.id] = radio.value;
                 });
+            } else if ((input.tagName.toLowerCase() === 'select') && input.multiple) {
+                data[field.id] = Array.from(input.selectedOptions).map(option => option.value);
             } else {
                 data[field.id] = input.value;
             };
@@ -373,6 +385,8 @@ async function save() {
                 radios.forEach(radio => {
                     if (radio.checked) data[field.id] = radio.value;
                 });
+            } else if ((input.tagName.toLowerCase() === 'select') && input.multiple) {
+                data[field.id] = Array.from(input.selectedOptions).map(option => option.value);
             } else {
                 data[field.id] = input.value;
             };

index.js

@@ -33,7 +33,7 @@ const customText = {
   userWelcomeBefore: 'Welcome, ',
   userWelcomeAfter: '!',
   activationTitle: 'Activation',
-  sessionTitle: 'Session',
+  sessionTitle: 'Enable Cookies',
   tenantTitle: 'Configuration',
   authTitle: 'Authentication Required',
   authDescriptionBefore: 'You\'ll need to log into your ',
@@ -106,7 +106,6 @@ const customText = {
   commissionNotFoundJson: 'The requested commission was not found.'
 };
 
-
 function getCustomText(key, def) {
   if (tenant && tenant.customText && Object.prototype.hasOwnProperty.call(tenant.customText, key)) return tenant.customText[key];
   return (customText[key] !== undefined) ? customText[key] : def;