fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-10829

Browse Source
This commit is contained in:
Hector Cortez
2013-02-26 09:25:14 -04:00
parent c5a4417979 7a37bc460d
commit 34ed244795
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.xmlform.php
View File

@@ -3787,8 +3787,8 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
} elseif ($this->mode === 'view') {
$html = '';
foreach ($this->options as $optionName => $option) {
$html .= '<input class="FormCheck" id="form[' . $this->name . '][' . $optionName . ']" name="form[' . $this->name . '][]" type=\'checkbox\' value="' . $optionName . '"' . (in_array( $optionName, $value ) ? 'checked' : '') . ' disabled><span class="FormCheck"><label for="form[' . $this->name . '][' . $optionName . ']">' . $option . '</label></span></input><br>';
$html .= '<input type="hidden" id="form[' . $this->name . '][' . $optionName . ']" name="form[' . $this->name . '][]" value="' . ((in_array( $optionName, $value )) ? $optionName : '') . '">';
$html .= '<input class="FormCheck" id="form[' . $this->name . '][' . $optionName . ']" type=\'checkbox\' value="' . $optionName . '"' . (in_array( $optionName, $value ) ? 'checked' : '') . ' disabled><span class="FormCheck"><label for="form[' . $this->name . '][' . $optionName . ']">' . $option . '</label></span></input><br>';
$html .= '<input type="hidden" name="form[' . $this->name . '][]" value="' . ((in_array( $optionName, $value )) ? $optionName : '') . '">';
}
return $html;
} else {

2
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -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';

4
workflow/engine/templates/cases/casesList.js
View File

@@ -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'}
]
})
});

2
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -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<calendarDays.length;i++){
calendarObj[calendarDays[i]]=true;