Fix source fields for new generators

am-impact · Jan 14, 2016 · df91412 · df91412
1 parent bf4ec63
commit df91412
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/AmSeed_GeneratorsController.php b/controllers/AmSeed_GeneratorsController.php
@@ -91,8 +91,8 @@ public function actionSaveGenerator()
         $fields = craft()->request->getPost('sourceFields');
 
         // Get fields
-        if (isset($fields[ $generator->elementType ]) && isset($generator->settings['source'])) {
-            $settings[ $generator->elementType ]['fields'] = $fields[ $generator->elementType ][ $generator->settings['source'] ];
+        if (isset($fields[ $generator->elementType ]) && isset($settings[ $generator->elementType ]['source'])) {
+            $settings[ $generator->elementType ]['fields'] = $fields[ $generator->elementType ][ $settings[ $generator->elementType ]['source'] ];
         }
 
         // Get settings

diff --git a/templates/generators/_includes/sourceFields.twig b/templates/generators/_includes/sourceFields.twig
@@ -21,7 +21,7 @@
                                                 id: 'sourceFields[' ~ type ~ '][' ~ source ~ '][' ~ fieldId ~ '][enabled]',
                                                 name: 'sourceFields[' ~ type ~ '][' ~ source ~ '][' ~ fieldId ~ '][enabled]',
                                                 value: 1,
-                                                checked: (generator is defined and generator.settings['fields'][fieldId]['enabled'] is defined ? generator.settings['fields'][fieldId]['enabled'] : field.required),
+                                                checked: (generator is defined and generator.settings['fields'][fieldId]['enabled'] is defined ? (generator.settings['fields'][fieldId]['enabled'] or field.required) : field.required),
                                                 disabled: field.required,
                                             }) }}
                                         </td>