From 54b18f2dfc4a9749e27c674c5ab27b6b267ffca7 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@fullscreen.io>
Date: Tue, 10 Oct 2017 10:37:25 +1300
Subject: [PATCH] =?UTF-8?q?Modify=20ElementForm=20to=20contain=20its?=
 =?UTF-8?q?=E2=80=99=20own=20form=20builder.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/form.svg                               | 18 ++++++
 src/Control/ElementFormController.php         | 25 +++++++++
 src/Model/ElementForm.php                     | 55 +++++++++++++++++++
 src/Model/ElementUserDefinedForm.php          | 38 -------------
 .../Elemental/UserForms/Model/ElementForm.ss  |  3 +
 5 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100644 images/form.svg
 create mode 100644 src/Control/ElementFormController.php
 create mode 100644 src/Model/ElementForm.php
 delete mode 100644 src/Model/ElementUserDefinedForm.php
 create mode 100644 templates/DNADesign/Elemental/UserForms/Model/ElementForm.ss

diff --git a/images/form.svg b/images/form.svg
new file mode 100644
index 0000000..6c23ea3
--- /dev/null
+++ b/images/form.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<g>
+	<path d="M45,5v40H5V5H45 M45,0H5C2.2,0,0,2.2,0,5v40c0,2.8,2.2,5,5,5h40c2.8,0,5-2.2,5-5V5C50,2.2,47.8,0,45,0L45,0z"/>
+</g>
+<g>
+	<rect x="12.5" y="12.8" width="12.5" height="5"/>
+</g>
+<g>
+	<rect x="12.5" y="22.5" width="21.6" height="5"/>
+</g>
+<g>
+	<rect x="12.5" y="32.6" width="21.6" height="5"/>
+</g>
+</svg>
diff --git a/src/Control/ElementFormController.php b/src/Control/ElementFormController.php
new file mode 100644
index 0000000..fab316d
--- /dev/null
+++ b/src/Control/ElementFormController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DNADesign\Elemental\UserForms\Control;
+
+use DNADesign\Elemental\Controllers\ElementController;
+use SilverStripe\Control\Controller;
+use SilverStripe\UserForms\Control\UserDefinedFormController;
+
+class ElementFormController extends ElementController
+{
+    public function __construct($element = null)
+    {
+        parent::__construct($element);
+
+        $current = Controller::curr();
+
+        if ($current->getRequest()->isPOST()) {
+            // handle the post request.
+            $user = UserDefinedFormController::create($element);
+            $form = $user->Form();
+
+            $user->process($current->getRequest()->postVars(), $form);
+        }
+    }
+}
diff --git a/src/Model/ElementForm.php b/src/Model/ElementForm.php
new file mode 100644
index 0000000..ad90af0
--- /dev/null
+++ b/src/Model/ElementForm.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace DNADesign\Elemental\UserForms\Model;
+
+use SilverStripe\UserForms\Control\UserDefinedFormController;
+use SilverStripe\UserForms\UserForm;
+use SilverStripe\Control\Controller;
+use DNADesign\Elemental\Models\BaseElement;
+use DNADesign\Elemental\UserForms\Control\ElementFormController;
+
+class ElementForm extends BaseElement
+{
+    use UserForm;
+
+    /**
+     * @var string
+     */
+    private static $table_name = 'ElementForm';
+
+    /**
+     * @var string
+     */
+    private static $title = 'Form';
+
+    /**
+     * @var string
+     */
+    private static $icon = 'elemental-userforms/images/form.svg';
+
+    /**
+     * @var string
+     */
+    private static $controller_class = ElementFormController::class;
+
+    public function ElementForm()
+    {
+        $controller = new UserDefinedFormController($this);
+        $current = Controller::curr();
+
+        if ($current && $current->getAction() == 'finished') {
+            return $controller->renderWith('ReceivedFormSubmission');
+        }
+
+        $form = $controller->Form();
+        $form->setFormAction(Controller::join_links(
+            $current->Link(),
+            'element',
+            $this->owner->ID
+        ));
+
+        return $form;
+    }
+
+
+}
diff --git a/src/Model/ElementUserDefinedForm.php b/src/Model/ElementUserDefinedForm.php
deleted file mode 100644
index 2897473..0000000
--- a/src/Model/ElementUserDefinedForm.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace DNADesign\Elemental\Models;
-
-use UserDefinedForm_Controller;
-use SilverStripe\Control\Controller;
-
-/**
- * @package elemental
- */
-class ElementUserDefinedForm extends BaseElement
-{
-
-    private static $has_one = array(
-        'Form' => UserDefinedForm::class
-    );
-
-    private static $table_name = 'ElementForm';
-
-    private static $title = 'Form Element';
-
-    public function ElementForm()
-    {
-        if ($this->Form()->exists()) {
-            $controller = new UserDefinedForm_Controller($this->Form());
-
-            $current = Controller::curr();
-
-            if ($current && $current->getAction() == 'finished') {
-                return $controller->renderWith('ReceivedFormSubmission');
-            }
-
-            $form = $controller->Form();
-
-            return $form;
-        }
-    }
-}
diff --git a/templates/DNADesign/Elemental/UserForms/Model/ElementForm.ss b/templates/DNADesign/Elemental/UserForms/Model/ElementForm.ss
new file mode 100644
index 0000000..4c17e96
--- /dev/null
+++ b/templates/DNADesign/Elemental/UserForms/Model/ElementForm.ss
@@ -0,0 +1,3 @@
+<div class="elementform-form">
+    $ElementForm
+</div>