From 9989cbbad688f19d777c31d249b998fdd24ffcab Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 12 Dec 2014 16:10:23 -0400 Subject: [PATCH 1/3] BUG-16459 Cases Notes: No muestra todo el texto introducido --- workflow/engine/templates/app/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 6a03efda2..cf514ff1a 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -173,7 +173,7 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU caseNotesWindow = new Ext.Window({ title: _('ID_CASES_NOTES'), //Title of the Window id: 'caseNotesWindowPanel', //ID of the Window Panel - width: 350, //Width of the Window + width: 380, //Width of the Window resizable: true, //Resize of the Window, if false - it cannot be resized closable: true, //Hide close button of the Window modal: modalSw, //When modal:true it make the window modal and mask everything behind it when displayed @@ -181,7 +181,7 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU autoCreate: true, height:400, shadow:true, - minWidth:300, + minWidth:380, minHeight:200, proxyDrag: true, constrain: true, From 4f52f0a4336929f42ae5ec7bb4d5c69693c6d819 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Sat, 13 Dec 2014 16:45:53 -0400 Subject: [PATCH 2/3] PM-1111 "16332: Grids with same name (Small fix)" SOLVED Small fix --- workflow/engine/methods/dynaforms/dynaforms_Save.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/dynaforms/dynaforms_Save.php b/workflow/engine/methods/dynaforms/dynaforms_Save.php index 8a64a7774..16a145edc 100755 --- a/workflow/engine/methods/dynaforms/dynaforms_Save.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Save.php @@ -91,6 +91,7 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { //if ($aData['DYN_UID']==='') unset($aData['DYN_UID']); $dynaform = new dynaform(); + $dynaFormAux = new ProcessMaker\BusinessModel\DynaForm(); if (isset($aData["DYN_UID"])) { $dynaform->Save($aData); @@ -162,7 +163,8 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { $aDataAux = $aData; $aDataAux["DYN_TYPE"] = "grid"; - $aDataAux["DYN_TITLE"] = $copyDynGrdTitle . ((!$dynaformGrid->verifyExistingName($copyDynGrdTitle, $dynaform->getProUid()))? " (" . $dynaform->getDynTitle() . ")" : ""); + + $aDataAux["DYN_TITLE"] = $copyDynGrdTitle . (($dynaFormAux->existsTitle($dynaform->getProUid(), $copyDynGrdTitle))? " (" . $dynaform->getDynTitle() . ")" : ""); $aDataAux["DYN_DESCRIPTION"] = $copyDynGrdDescription; $aFields = $dynaformGrid->create($aDataAux); From 2f0053a66798333360540dc64d0603243c054ab6 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Sat, 13 Dec 2014 16:50:32 -0400 Subject: [PATCH 3/3] PM-1111 "16332: Grids with same name (Small fix)" SOLVED Small fix --- workflow/engine/methods/dynaforms/dynaforms_Save.php | 1 - 1 file changed, 1 deletion(-) diff --git a/workflow/engine/methods/dynaforms/dynaforms_Save.php b/workflow/engine/methods/dynaforms/dynaforms_Save.php index 16a145edc..f39e6a6f2 100755 --- a/workflow/engine/methods/dynaforms/dynaforms_Save.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Save.php @@ -163,7 +163,6 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameDynaform') { $aDataAux = $aData; $aDataAux["DYN_TYPE"] = "grid"; - $aDataAux["DYN_TITLE"] = $copyDynGrdTitle . (($dynaFormAux->existsTitle($dynaform->getProUid(), $copyDynGrdTitle))? " (" . $dynaform->getDynTitle() . ")" : ""); $aDataAux["DYN_DESCRIPTION"] = $copyDynGrdDescription;