Fix grouped custom fields not saving deselected values #333

lib/models/fields.js

@@ -469,6 +469,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
             case 'radio':
             case 'checkbox':
                 {
+                    let hasSelectedOption = (field.options || []).some(subField => subField.column && valueList[subField.column]);
                     let item = {
                         id: field.id,
                         type: field.type,
@@ -481,8 +482,15 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
                         groupTemplate: field.groupTemplate,
                         options: (field.options || []).map(subField => {
                             if (onlyExisting && subField.column && !valueList.hasOwnProperty(subField.column)) {
-                                // ignore missing values
+                                if (hasSelectedOption && field.type !== 'checkbox') {
-                                return false;
+                                    // Set all radio or dropdown options if a selection for the group is present
+                                } else if (field.type === 'checkbox' && values['originGroupG' + field.id] === 'webform') {
+                                    // Set all checkbox options if origin is webform (subscribe, manage, or admin edit) #333
+                                    // Atomic updates via API call or CSV import still possible
+                                } else {
+                                    // ignore missing values
+                                    return false;
+                                }
                             }
                             return {
                                 type: subField.type,

views/lists/subscription/edit.hbs

@@ -130,6 +130,7 @@
                 {{/if}}
 
                 {{#if typeCheckbox}}
+                    <input type="hidden" name="origin_{{key}}" value="webform">
                     {{#each options}}
                         <div class="checkbox">
                             <label>

views/subscription/partials/subscription-custom-fields.hbs

@@ -130,8 +130,9 @@
     {{/if}}
 
     {{#if typeCheckbox}}
-        <div class="form-group checkbox">
+        <div class="form-group checkbox {{key}}">
             <label>{{name}}</label>
+            <input type="hidden" name="origin_{{key}}" value="webform">
             {{#each options}}
                 <label class="label-checkbox">
                     <input type="checkbox" name="{{column}}" value="1" {{#if value}} checked {{/if}}> {{name}}