From 6243b8ad98b2ee2b8255b58606fbdecaee21b604 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 25 Feb 2013 12:03:24 -0400 Subject: [PATCH 1/4] BUG 10881 Informacion de Calendario al inicar un caso siempre es Default pese a que se seleccione uno diferente para el proceso SOLVED - Don't get correctly the calendar information and the checkboxed are not refreshed correctly - Get the correctly calendar information the checkboxes are reseted before load the new calendar information --- workflow/engine/methods/cases/casesStartPage_Ajax.php | 2 +- workflow/engine/templates/cases/casesStartCase.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index dbd9f2472..96dd1f237 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -90,7 +90,7 @@ function getProcessList () $processInfoChild['myInbox'] = 0; $processInfoChild['totalInbox'] = 0; if (isset( $proData[$processInfoChild['pro_uid']] )) { - $tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $processInfoChild['uid'], $processInfoChild['uid'], $processInfoChild['uid'] ) ); + $tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $_SESSION['USER_LOGGED'], $processInfoChild['pro_uid'], $processInfoChild['uid'] ) ); $tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"] ) ) ) ); $tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION']; //$tempTree['cls']='file'; diff --git a/workflow/engine/templates/cases/casesStartCase.js b/workflow/engine/templates/cases/casesStartCase.js index 74bbd71b2..7833fcfc1 100755 --- a/workflow/engine/templates/cases/casesStartCase.js +++ b/workflow/engine/templates/cases/casesStartCase.js @@ -324,7 +324,7 @@ function showDetailsA(selectedNode) { if ((selectedNode)&&(selectedNode.attributes.otherAttributes)) { otherAttributes = selectedNode.attributes.otherAttributes; calendarDays=(otherAttributes.CALENDAR_WORK_DAYS).split("|"); - calendarObj={}; + calendarObj={0: false, 1: false, 2: false, 3: false, 4: false, 5: false, 6: false}; for(i=0;i Date: Mon, 25 Feb 2013 14:41:17 -0400 Subject: [PATCH 2/4] Improvement in the reassign users list when click in "actions" menu --- workflow/engine/templates/cases/casesList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index ea32073fc..ba1d341ac 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -1367,9 +1367,9 @@ Ext.onReady ( function() { root: 'data', fields : [ {name : 'USR_UID'}, - {name : 'PRO_USERNAME'}, + {name : 'USR_USERNAME'}, {name : 'USR_FIRSTNAME'}, - {name : 'PRO_LASTNAME'} + {name : 'USR_LASTNAME'} ] }) }); From 40f3b9d934ca1d2b78ba951221446f134270bcf7 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Mon, 25 Feb 2013 15:27:30 -0400 Subject: [PATCH 3/4] BUG 10885 Checkgroup submit problem SOLVED - Fields duplicated in form view types hidden and checkbox. - Was delete de name in field checkbox in form view. --- gulliver/system/class.xmlform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index a5ff6fed6..7ad4e0ae9 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3787,7 +3787,7 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field } elseif ($this->mode === 'view') { $html = ''; foreach ($this->options as $optionName => $option) { - $html .= '
'; + $html .= '
'; $html .= ''; } return $html; From fe24c6ccbd734f302099cb8ac43f3458b2e8530c Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Mon, 25 Feb 2013 17:09:29 -0400 Subject: [PATCH 4/4] BUG 10885 Checkgroup submit problem SOLVED - Fields duplicated in form view types hidden and checkbox. - Was delete de name in field checkbox in form view. --- gulliver/system/class.xmlform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 7ad4e0ae9..4c582c8da 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3788,7 +3788,7 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field $html = ''; foreach ($this->options as $optionName => $option) { $html .= '
'; - $html .= ''; + $html .= ''; } return $html; } else {