fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-12-16 15:24:45 -04:00
parent f712cb4468 9e878cc516
commit b7cb97c60c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/dynaforms/dynaforms_Save.php
View File

@@ -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,7 @@ 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);

4
workflow/engine/templates/app/main.js
View File

@@ -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,