Merge remote-tracking branch 'origin/3.1'

# Conflicts: # code/forms/UserForm.php # code/model/UserDefinedForm.php # code/model/editableformfields/EditableFileField.php # code/model/editableformfields/EditableOption.php
silverstripe · Aug 17, 2016 · c6c609a · c6c609a
2 parents eef1671 + ca2a6a3
commit c6c609a
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 171 deletions.
diff --git a/code/forms/UserForm.php b/code/forms/UserForm.php
@@ -6,49 +6,49 @@
 class UserForm extends Form
 {
 
-    /**
-     * @param Controller $controller
-     * @param string $name
-     */
+	/**
+	 * @param Controller $controller
+	 * @param string $name
+	 */
     public function __construct(Controller $controller, $name = 'Form')
     {
-        $this->controller = $controller;
-        $this->setRedirectToFormOnValidationError(true);
-
-        parent::__construct(
-            $controller,
-            $name,
-            new FieldList(),
-            new FieldList()
-        );
-
-        $this->setFields($fields = $this->getFormFields());
-        $fields->setForm($this);
-        $this->setActions($actions = $this->getFormActions());
-        $actions->setForm($this);
-        $this->setValidator($this->getRequiredFields());
+		$this->controller = $controller;
+		$this->setRedirectToFormOnValidationError(true);
+
+		parent::__construct(
+			$controller,
+			$name,
+			new FieldList(),
+			new FieldList()
+		);
+
+		$this->setFields($fields = $this->getFormFields());
+		$fields->setForm($this);
+		$this->setActions($actions = $this->getFormActions());
+		$actions->setForm($this);
+		$this->setValidator($this->getRequiredFields());
 
         // This needs to be re-evaluated since fields have been assigned
         $this->setupFormErrors();
 
-        // Number each page
-        $stepNumber = 1;
-        foreach ($this->getSteps() as $step) {
-            $step->setStepNumber($stepNumber++);
-        }
+		// Number each page
+		$stepNumber = 1;
+		foreach($this->getSteps() as $step) {
+			$step->setStepNumber($stepNumber++);
+		}
 
-        if ($controller->DisableCsrfSecurityToken) {
-            $this->disableSecurityToken();
-        }
+		if($controller->DisableCsrfSecurityToken) {
+			$this->disableSecurityToken();
+		}
 
-        $data = Session::get("FormInfo.{$this->FormName()}.data");
+		$data = Session::get("FormInfo.{$this->FormName()}.data");
 
-        if (is_array($data)) {
-            $this->loadDataFrom($data);
-        }
+		if(is_array($data)) {
+			$this->loadDataFrom($data);
+		}
 
-        $this->extend('updateForm');
-    }
+		$this->extend('updateForm');
+	}
 
     public function setupFormErrors()
     {
@@ -60,118 +60,126 @@ public function setupFormErrors()
         return $this;
     }
 
-    /**
-     * Used for partial caching in the template.
-     *
-     * @return string
-     */
+	/**
+	 * Used for partial caching in the template.
+	 *
+	 * @return string
+	 */
     public function getLastEdited()
     {
-        return $this->controller->LastEdited;
-    }
+		return $this->controller->LastEdited;
+	}
 
-    /**
-     * @return bool
-     */
+	/**
+	 * @return bool
+	 */
     public function getDisplayErrorMessagesAtTop()
     {
-        return (bool)$this->controller->DisplayErrorMessagesAtTop;
-    }
-
-    /**
-     * Return the fieldlist, filtered to only contain steps
-     *
-     * @return ArrayList
-     */
+		return (bool)$this->controller->DisplayErrorMessagesAtTop;
+	}
+
+	/**
+	 * Return the fieldlist, filtered to only contain steps
+	 *
+	 * @return ArrayList
+	 */
     public function getSteps()
     {
-        return $this->Fields()->filterByCallback(function ($field) {
-            return $field instanceof UserFormsStepField;
-        });
-    }
-
-    /**
-     * Get the form fields for the form on this page. Can modify this FieldSet
-     * by using {@link updateFormFields()} on an {@link Extension} subclass which
-     * is applied to this controller.
-     *
-     * This will be a list of top level composite steps
-     *
-     * @return FieldList
-     */
+		return $this->Fields()->filterByCallback(function($field) {
+			return $field instanceof UserFormsStepField;
+		});
+	}
+
+	/**
+	 * Get the form fields for the form on this page. Can modify this FieldSet
+	 * by using {@link updateFormFields()} on an {@link Extension} subclass which
+	 * is applied to this controller.
+	 *
+	 * This will be a list of top level composite steps
+	 *
+	 * @return FieldList
+	 */
     public function getFormFields()
     {
-        $fields = new UserFormsFieldList();
-        $target = $fields;
-        foreach ($this->controller->Fields() as $field) {
-            $target = $target->processNext($field);
-        }
-        $fields->clearEmptySteps();
-        $this->extend('updateFormFields', $fields);
+		$fields = new UserFormsFieldList();
+		$target = $fields;
+		foreach ($this->controller->Fields() as $field) {
+			$target = $target->processNext($field);
+		}
+		$fields->clearEmptySteps();
+		$this->extend('updateFormFields', $fields);
         $fields->setForm($this);
-        return $fields;
-    }
-
-    /**
-     * Generate the form actions for the UserDefinedForm. You
-     * can manipulate these by using {@link updateFormActions()} on
-     * a decorator.
-     *
-     * @todo Make form actions editable via their own field editor.
-     *
-     * @return FieldList
-     */
+		return $fields;
+	}
+
+	/**
+	 * Generate the form actions for the UserDefinedForm. You
+	 * can manipulate these by using {@link updateFormActions()} on
+	 * a decorator.
+	 *
+	 * @todo Make form actions editable via their own field editor.
+	 *
+	 * @return FieldList
+	 */
     public function getFormActions()
     {
-        $submitText = ($this->controller->SubmitButtonText) ? $this->controller->SubmitButtonText : _t('UserDefinedForm.SUBMITBUTTON', 'Submit');
-        $clearText = ($this->controller->ClearButtonText) ? $this->controller->ClearButtonText : _t('UserDefinedForm.CLEARBUTTON', 'Clear');
+		$submitText = ($this->controller->SubmitButtonText) ? $this->controller->SubmitButtonText : _t('UserDefinedForm.SUBMITBUTTON', 'Submit');
+		$clearText = ($this->controller->ClearButtonText) ? $this->controller->ClearButtonText : _t('UserDefinedForm.CLEARBUTTON', 'Clear');
 
-        $actions = new FieldList(
-            new FormAction("process", $submitText)
-        );
+		$actions = new FieldList(
+			new FormAction("process", $submitText)
+		);
 
-        if ($this->controller->ShowClearButton) {
-            $actions->push(new ResetFormAction("clearForm", $clearText));
-        }
+		if($this->controller->ShowClearButton) {
+			$actions->push(new ResetFormAction("clearForm", $clearText));
+		}
 
-        $this->extend('updateFormActions', $actions);
+		$this->extend('updateFormActions', $actions);
         $actions->setForm($this);
-        return $actions;
-    }
-
-    /**
-     * Get the required form fields for this form.
-     *
-     * @return RequiredFields
-     */
+		return $actions;
+	}
+
+	/**
+	 * Get the required form fields for this form.
+	 *
+	 * @return RequiredFields
+	 */
     public function getRequiredFields()
     {
-        // Generate required field validator
-        $requiredNames = $this
+		// Generate required field validator
+		$requiredNames = $this
             ->getController()
-            ->Fields()
-            ->filter('Required', true)
-            ->column('Name');
-        $required = new RequiredFields($requiredNames);
-        $this->extend('updateRequiredFields', $required);
+			->Fields()
+			->filter('Required', true)
+			->column('Name');
+		$required = new RequiredFields($requiredNames);
+		$this->extend('updateRequiredFields', $required);
         $required->setForm($this);
-        return $required;
-    }
-
-    /**
-     * Override some we can add UserForm specific attributes to the form.
-     *
-     * @return array
-     */
+		return $required;
+	}
+
+	/**
+	 * Override some we can add UserForm specific attributes to the form.
+	 *
+	 * @return array
+	 */
     public function getAttributes()
     {
-        $attrs = parent::getAttributes();
+		$attrs = parent::getAttributes();
 
-        $attrs['class'] = $attrs['class'] . ' userform';
-        $attrs['data-livevalidation'] = (bool)$this->controller->EnableLiveValidation;
-        $attrs['data-toperrors'] = (bool)$this->controller->DisplayErrorMessagesAtTop;
-        $attrs['data-hidefieldlabels'] = (bool)$this->controller->HideFieldLabels;
+		$attrs['class'] = $attrs['class'] . ' userform';
+		$attrs['data-livevalidation'] = (bool)$this->controller->EnableLiveValidation;
+		$attrs['data-toperrors'] = (bool)$this->controller->DisplayErrorMessagesAtTop;
+		$attrs['data-hidefieldlabels'] = (bool)$this->controller->HideFieldLabels;
 
-        return $attrs;
+		return $attrs;
+	}
+
+    /**
+     * @return string
+     */
+    public function getButtonText() {
+        return $this->config()->get('button_text');
     }
+
 }