v2.0.0-beta.18

Author: kjmartens

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Solspace Freeform Changelog
 
+## 2.0.0-beta.18 - 2018-05-02
+### Changed
+- Updated Composer to no longer have a default Form Name, and also auto-generate a Form Handle based on the Form Name.
+
+### Fixed
+- Fixed a bug where clicking the Settings link from the Plugins list was not rerouted correctly.
+- Fixed a bug where the Spam Folder API queue migration did not account for prefixed database tables.
+- Fixed a bug where updates could error if you updated Pro before Lite.
+- Fixed a bug where fields with numeric options were not always using the correct values.
+
 ## 2.0.0-beta.17 - 2018-05-01
 ### Added
 - Added field option Element and Data Feeders for Checkbox group, Radio group, Select and Multi-select fieldtypes. You can now populate these fields with Entries, Categories, Tags, Users, or one of our many predefined options: States, Provinces, Countries, Languages, Number ranges, Year ranges, Months, Days and Days of the Week. Freeform Data Feeders also offer flexible control over formatting and/or which data fills option labels and option values.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-freeform",
   "description": "The most intuitive and powerful form builder for Craft.",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "authors": [
@@ -29,7 +29,7 @@
     }
   },
   "extra": {
-    "schemaVersion": "2.0.8",
+    "schemaVersion": "2.0.9",
     "handle": "freeform",
     "class": "Solspace\\Freeform\\Freeform",
     "name": "Freeform Lite",

src/Controllers/CrmController.php

@@ -59,7 +59,7 @@ public function actionIndex(): Response
         \Craft::$app->view->registerAssetBundle(CrmBundle::class);
 
         return $this->renderTemplate(
-            'freeform/_settings/crm',
+            'freeform/settings/_crm',
             [
                 'integrations' => $integrations,
                 'providers'    => $this->getCRMService()->getAllCRMServiceProviders(),
@@ -322,7 +322,7 @@ private function renderEditForm(IntegrationModel $model, string $title): Respons
             'settings'             => $settingBlueprints,
         ];
 
-        return $this->renderTemplate('freeform/_settings/crm_edit', $variables);
+        return $this->renderTemplate('freeform/settings/_crm_edit', $variables);
     }
 
     /**

src/Controllers/MailingListsController.php

@@ -48,7 +48,7 @@ public function actionIndex(): Response
         \Craft::$app->view->registerAssetBundle(MailingListsBundle::class);
 
         return $this->renderTemplate(
-            'freeform/_settings/mailing_lists',
+            'freeform/settings/_mailing_lists',
             [
                 'integrations' => $mailingListIntegrations,
                 'providers'    => $this->getMailingListsService()->getAllMailingListServiceProviders(),
@@ -310,6 +310,6 @@ private function renderEditForm(IntegrationModel $model, string $title): Respons
             'settings'             => $settingBlueprints,
         ];
 
-        return $this->renderTemplate('freeform/_settings/mailing_list_edit', $variables);
+        return $this->renderTemplate('freeform/settings/_mailing_list_edit', $variables);
     }
 }

src/Controllers/SettingsController.php

@@ -206,7 +206,7 @@ public function actionProvideSetting(): Response
         $template = \Craft::$app->request->getSegment(3);
 
         return $this->renderTemplate(
-            'freeform/_settings/' . (string) $template,
+            'freeform/settings/' . ($template ? '_' . (string) $template : ''),
             [
                 'settings' => $this->getSettingsModel(),
             ]

src/Library/Composer/Components/Fields/Traits/MultipleValueTrait.php

@@ -58,11 +58,7 @@ public function setValue($value)
         if ($this instanceof OptionsInterface) {
             $updatedOptions = [];
             foreach ($this->getOptions() as $option) {
-                if (is_numeric($option->getValue())) {
-                    $checked = \in_array((int) $option->getValue(), $this->getValue(), false);
-                } else {
-                    $checked = \in_array($option->getValue(), $this->getValue(), true);
-                }
+                $checked = \in_array($option->getValue(), $this->getValue(), false);
 
                 $updatedOptions[] = new Option(
                     $option->getLabel(),

src/Library/Composer/Components/Fields/Traits/SingleValueTrait.php

@@ -55,16 +55,10 @@ public function setValue($value)
             }
 
             foreach ($this->getOptions() as $option) {
-                if (is_numeric($objectValue) && is_numeric($option->getValue())) {
-                    $checked = (int) $option->getValue() === (int) $objectValue;
-                } else {
-                    $checked = $option->getValue() === $objectValue;
-                }
-
                 $updatedOptions[] = new Option(
                     $option->getLabel(),
                     $option->getValue(),
-                    $checked
+                    (string) $option->getValue() === (string) $objectValue
                 );
             }
 

src/Library/Composer/Composer.php

@@ -253,8 +253,8 @@ private function setDefaults()
                 ],
                 Properties::FORM_HASH                => [
                     'type'                  => Properties::FORM_HASH,
-                    'name'                  => 'Composer Form',
-                    'handle'                => 'composerForm',
+                    'name'                  => '',
+                    'handle'                => '',
                     'color'                 => '#' . substr(md5(random_int(111, 999) . time()), 0, 6),
                     'submissionTitleFormat' => '{{ dateCreated|date("Y-m-d H:i:s") }}',
                     'description'           => '',

src/Records/FormRecord.php

@@ -73,7 +73,7 @@ public function rules(): array
     {
         return [
             [['handle'], 'unique'],
-            [['handle'], 'required'],
+            [['name', 'handle'], 'required'],
         ];
     }
 }