diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index a5ff6fed6..4c582c8da 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -3787,8 +3787,8 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field } elseif ($this->mode === 'view') { $html = ''; foreach ($this->options as $optionName => $option) { - $html .= '
'; - $html .= ''; + $html .= '
'; + $html .= ''; } return $html; } else { 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/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'} ] }) }); 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