Merge pull request #1347 from julceslauhub/master

BUG 10881 Informacion de Calendario al inicar un caso siempre es Default pese a que se seleccione uno diferente para el proceso SOLVED
This commit is contained in:
julceslauhub
2013-02-25 08:06:03 -08:00
2 changed files with 2 additions and 2 deletions

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

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;