Merged in julceslau/processmaker (pull request #711)

BUG 13646 Text Area width and height can be altered in a dynaform mode view SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-22 16:58:24 -04:00

View File

@@ -324,8 +324,8 @@ class XmlForm_Field
return 1; return 1;
} }
if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){ if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
return 1; return 1;
} }
if (! $this->sqlConnection) { if (! $this->sqlConnection) {
@@ -1965,7 +1965,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field
} }
$html = ''; $html = '';
$scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;"; $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;resize:none;";
if ($this->renderMode == 'edit') { if ($this->renderMode == 'edit') {
//EDIT MODE //EDIT MODE
$readOnlyText = ($this->readOnly == 1 || $this->readOnly == '1') ? 'readOnly="readOnly"' : ''; $readOnlyText = ($this->readOnly == 1 || $this->readOnly == '1') ? 'readOnly="readOnly"' : '';
@@ -2031,7 +2031,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field
$arrayOptions[$r] = $v; $arrayOptions[$r] = $v;
$scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;"; $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;resize:none;";
$html = ''; $html = '';
if ($this->renderMode == 'edit') { if ($this->renderMode == 'edit') {
//EDIT MODE //EDIT MODE