From 80bdbb79b18e68ad69e4d4dd9fa393eff94270e8 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 5 Feb 2015 13:40:18 -0400 Subject: [PATCH] PM-1486 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 16755: Textarea resizing has been disabled in 2.8 Se agrego una nueva propiedad en el formulario de Textarea que permite si el campo sea de tamaƱariable o no. --- gulliver/system/class.xmlform.php | 9 +++++---- workflow/engine/methods/dynaforms/fields_Save.php | 8 ++++++++ workflow/engine/xmlform/dynaforms/fields/textarea.html | 5 +++++ workflow/engine/xmlform/dynaforms/fields/textarea.xml | 3 +++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 492e8081a..a085e4796 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -1938,6 +1938,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field public $cols = 40; public $required = false; public $readOnly = false; + public $resizable = false; public $wrap = 'OFF'; public $className; public $renderMode = ''; @@ -1970,9 +1971,9 @@ class XmlForm_Field_Textarea extends XmlForm_Field if ($this->renderMode == '') { $this->renderMode = $this->mode; } - + $resizable = ($this->resizable == 1 || $this->resizable == '1') ? 'resize:both;' : 'resize:none;'; $html = ''; - $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;resize:none;"; + $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;".$resizable; if ($this->renderMode == 'edit') { //EDIT MODE $readOnlyText = ($this->readOnly == 1 || $this->readOnly == '1') ? 'readOnly="readOnly"' : ''; @@ -2037,8 +2038,8 @@ class XmlForm_Field_Textarea extends XmlForm_Field } $arrayOptions[$r] = $v; - - $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;resize:none;"; + $resizable = ($this->resizable == 1 || $this->resizable == '1') ? 'resize:both;' : 'resize:none;'; + $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;".$resizable; $html = ''; if ($this->renderMode == 'edit') { //EDIT MODE diff --git a/workflow/engine/methods/dynaforms/fields_Save.php b/workflow/engine/methods/dynaforms/fields_Save.php index caea4282a..6c868a846 100755 --- a/workflow/engine/methods/dynaforms/fields_Save.php +++ b/workflow/engine/methods/dynaforms/fields_Save.php @@ -55,6 +55,14 @@ if (isset($_POST['form']['PME_READONLY'])) { $_POST['form']['PME_READONLY'] = 0; } +if (isset($_POST['form']['PME_RESIZABLE'])) { + if ($_POST['form']['PME_RESIZABLE'] == '') { + $_POST['form']['PME_RESIZABLE'] = 0; + } +} else { + $_POST['form']['PME_RESIZABLE'] = 0; +} + $_POST["form"]["PME_OPTGROUP"] = (isset($_POST["form"]["PME_OPTGROUP"]) && !empty($_POST["form"]["PME_OPTGROUP"]))? intval($_POST["form"]["PME_OPTGROUP"]) : 0; if (isset($_POST['form']['PME_SAVELABEL'])) { diff --git a/workflow/engine/xmlform/dynaforms/fields/textarea.html b/workflow/engine/xmlform/dynaforms/fields/textarea.html index 6fc5e98fd..d993209b3 100755 --- a/workflow/engine/xmlform/dynaforms/fields/textarea.html +++ b/workflow/engine/xmlform/dynaforms/fields/textarea.html @@ -48,6 +48,11 @@ {$PME_READONLY} {$form.PME_READONLY} + + + {$PME_RESIZABLE} + + {$form.PME_RESIZABLE} {$PME_DEFAULTVALUE} diff --git a/workflow/engine/xmlform/dynaforms/fields/textarea.xml b/workflow/engine/xmlform/dynaforms/fields/textarea.xml index cd21577d0..c51fcdc53 100755 --- a/workflow/engine/xmlform/dynaforms/fields/textarea.xml +++ b/workflow/engine/xmlform/dynaforms/fields/textarea.xml @@ -25,6 +25,9 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME + + +