From 950640babe9d3ccd9db071e7103eecfc02654113 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 12 Mar 2020 14:44:55 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B01986=20-=20Revert=20feature?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/src/Form/ObjectFormManager.php | 27 +------------------ .../src/Helper/ObjectFormHandlerHelper.php | 3 +-- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php index 2fc6c351a..8dd138e73 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php @@ -80,8 +80,6 @@ class ObjectFormManager extends FormManager protected $aFormProperties; /** @var array $aCallbackUrls */ protected $aCallbackUrls = array(); - /** @var boolean $bIsSubmittable */ - protected $bIsSubmittable = true; /** * Creates an instance of \Combodo\iTop\Portal\Form\ObjectFormManager from JSON data that must contain at least : @@ -222,29 +220,7 @@ class ObjectFormManager extends FormManager return $this; } - - /** - * - * @return string - */ - public function GetIsSubmittable() - { - return $this->bIsSubmittable; - } - /** - * - * @param boolean $bIsSubmittable - * - * @return $this - */ - public function SetIsSubmittable($bIsSubmittable) - { - $this->bIsSubmittable = $bIsSubmittable; - - return $this; - } - /** * * @return string @@ -663,8 +639,7 @@ class ObjectFormManager extends FormManager // Failsafe for AttributeType that would not have MakeFormField and therefore could not be used in a form if ($oField !== null) { - // If a form is in edit mode and can't be submitted to update an object (only transitions available), we have no reason to allow fields to be editable - if ($this->sMode !== static::ENUM_MODE_VIEW && $this->GetIsSubmittable()) + if ($this->sMode !== static::ENUM_MODE_VIEW) { // Field dependencies $aFieldDependencies = $oAttDef->GetPrerequisiteAttributes(); diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php index 5abb765c3..62231c95f 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php @@ -277,8 +277,7 @@ class ObjectFormHandlerHelper ->SetMode($sMode) ->SetActionRulesToken($sActionRulesToken) ->SetRenderer($oFormRenderer) - ->SetFormProperties($aFormProperties) - ->SetIsSubmittable(isset($aFormData['buttons']['submit']) || ($sMode === self::ENUM_MODE_CREATE)); + ->SetFormProperties($aFormProperties); $oFormManager->Build();