Update template class

Author: lhalaa

src/controllers/PartialUserFormController.php

@@ -2,6 +2,7 @@
 
 namespace Firesphere\PartialUserforms\Controllers;
 
+use Page;
 use Firesphere\PartialUserforms\Models\PartialFormSubmission;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
@@ -62,7 +63,8 @@ public function partial(HTTPRequest $request)
             $this->setFailover($this->dataRecord);
 
             $form = $this->Form();
-            $form->loadDataFrom($partial->getFieldList());
+            $fields = $partial->PartialFields()->map('Name', 'Value')->toArray();
+            $form->loadDataFrom($fields);
 
             // Copied from {@link UserDefinedFormController}
             if ($this->Content && $form && !$this->config()->disable_form_content_shortcode) {
@@ -75,19 +77,20 @@ public function partial(HTTPRequest $request)
                         $formEscapedForRegex,
                         $this->Content
                     );
+
                     return $this->customise([
                         'Content' => DBField::create_field('HTMLText', $content),
                         'Form' => '',
                         'PartialLink' => $partial->getPartialLink()
-                    ])->renderWith(['Firesphere\PartialUserforms\PartialUserForm', 'Page']);
+                    ])->renderWith([static::class, Page::class]);
                 }
             }
 
             return $this->customise([
                 'Content' => DBField::create_field('HTMLText', $this->Content),
                 'Form' => $form,
                 'PartialLink' => $partial->getPartialLink()
-            ])->renderWith(['Firesphere\PartialUserforms\PartialUserForm', 'Page']);
+            ])->renderWith([static::class, Page::class]);
         } else {
             return $this->httpError(404);
         }

src/models/PartialFormSubmission.php

@@ -212,21 +212,4 @@ public function generateKey($token)
     {
         return hash_pbkdf2('sha256', $token, $this->TokenSalt, 1000, 16);
     }
-
-    /**
-     * Get the partial fields in array
-     *
-     * @return array
-     */
-    public function getFieldList()
-    {
-        $list = [];
-        if ($this->PartialFields()->exists()) {
-            foreach ($this->PartialFields() as $field) {
-                $list[$field->Name] = $field->Value;
-            }
-        }
-
-        return $list;
-    }
 }

templates/Firesphere/PartialUserforms/Layout/PartialUserForm.ss renamed to templates/Firesphere/PartialUserforms/Controllers/Layout/PartialUserFormController.ss

@@ -139,12 +139,6 @@ public function testGenerateKey()
         $this->assertEquals(16, strlen($key));
     }
 
-    public function testGetFieldList()
-    {
-        $partial = PartialFormSubmission::create();
-        $this->assertEmpty($partial->getFieldList());
-    }
-
     protected function setUp()
     {
         parent::setUp();