fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1223 from julceslauhub/master

Browse Source 
BUG 10405 Problemas en la derivacion de subprocesos SOLVED
This commit is contained in:
julceslauhub
2013-01-24 08:56:28 -08:00
parent 06407d2b8e c7f505b496
commit e843576f79
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gulliver/methods/update/updating.php
View File

@@ -110,8 +110,8 @@ body { background: #ffffff none repeat scroll 0 0 }
/* === Content Styles === */ /* === Content Styles === */
#content { #content {
padding: 10px 44px; padding: 10px 44px;
background-image: url(../images/updating/underConstruction.png); background-image: url(../images/updating/underConstruction.png);
background-position: right top; background-position: right top;
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -141,7 +141,7 @@ body { background: #ffffff none repeat scroll 0 0 }
height: 100px; height: 100px;
text-align: center; text-align: center;
color: #ffffff; color: #ffffff;
} }
a.prev { a.prev {
@@ -166,32 +166,31 @@ a.next {
</style> </style>
</head> </head>
<body> <body>
<input id="remainingTime" type="hidden" value="<?=$_SERVER["timeRemainUpdate"];?>" />
<div class="container"> <div class="container">
<div id="header"> <div id="header">
<div id="logo"> <div id="logo">
<a href="index.html"><img src="../images/updating/logo.png" alt="logo"/></a> <a href="index.html"><img src="../images/updating/logo.png" alt="logo"/></a>
</div><!--end logo--> </div><!--end logo-->
<div id="contact_details"> <div id="contact_details">
<p><a href="#">info@colosa.com</a></p> <p><a href="#">info@colosa.com</a></p>
<p><a href="#">phone : +1-617-340-3377</a></p> <p><a href="#">phone : +1-617-340-3377</a></p>
</div><!--end contact details--> </div><!--end contact details-->
</div><!--end header--> </div><!--end header-->
<div style="clear:both"></div> <div style="clear:both"></div>
<div id="main"> <div id="main">
<div id="content"> <div id="content">
<div class="text"> <div class="text">
<h2>This website is under updating,</h2> <h2>This website is under updating,</h2>
<h2>please wait...</h2> <h2>please wait...</h2>
</div><!--end text--> </div><!--end text-->
<br/><br/><br/><br/> <br/><br/><br/><br/>
<br/><br/><br/><br/> <br/><br/><br/><br/>
<div class="details"> <div class="details">
<br/><br/> <br/><br/>
@@ -203,10 +202,10 @@ a.next {
<!--<a href="#">Directory</a> |--> <!--<a href="#">Directory</a> |-->
<a href="http://feeds.feedburner.com/processmaker">RSS</a> <a href="http://feeds.feedburner.com/processmaker">RSS</a>
<br> <br>
&copy; Copyright 2000 - 2012 Colosa, Inc. <a href="http://www.colosa.com">www.colosa.com</a> &copy; Copyright 2000 - 2012 Colosa, Inc. <a href="http://www.colosa.com">www.colosa.com</a>
</div><!--end details--> </div><!--end details-->
</div><!--end content--> </div><!--end content-->
</div><!--end main--> </div><!--end main-->
</div><!--end class container--> </div><!--end class container-->

3
workflow/engine/classes/class.derivation.php
View File

@@ -135,6 +135,7 @@ class Derivation
break; break;
} }
$aDerivation['NEXT_TASK']['USR_UID'] = ''; $aDerivation['NEXT_TASK']['USR_UID'] = '';
$aDerivation['NEXT_TASK']['USER_ASSIGNED'] = array('USR_UID' => '');
} else { } else {
//3. load the task information of normal NEXT_TASK //3. load the task information of normal NEXT_TASK
$aDerivation['NEXT_TASK'] = $oTask->load( $aDerivation['ROU_NEXT_TASK'] ); //print $aDerivation['ROU_NEXT_TASK']." **** ".$aDerivation['NEXT_TASK']['TAS_TYPE']."<hr>"; $aDerivation['NEXT_TASK'] = $oTask->load( $aDerivation['ROU_NEXT_TASK'] ); //print $aDerivation['ROU_NEXT_TASK']." **** ".$aDerivation['NEXT_TASK']['TAS_TYPE']."<hr>";
@@ -764,7 +765,7 @@ class Derivation
if ($aSP['SP_SYNCHRONOUS'] == 0) { if ($aSP['SP_SYNCHRONOUS'] == 0) {
$this->case->setDelInitDate( $currentDelegation['APP_UID'], $iNewDelIndex ); $this->case->setDelInitDate( $currentDelegation['APP_UID'], $iNewDelIndex );
$aDeriveTasks = $this->prepareInformation( array ('USER_UID' => - 1,'APP_UID' => $currentDelegation['APP_UID'],'DEL_INDEX' => $iNewDelIndex $aDeriveTasks = $this->prepareInformation( array ('USER_UID' => -1,'APP_UID' => $currentDelegation['APP_UID'],'DEL_INDEX' => $iNewDelIndex
) ); ) );
if (isset( $aDeriveTasks[1] )) { if (isset( $aDeriveTasks[1] )) {