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

Merge pull request #2247 from julceslauhub/master

Browse Source 
BUG 13712 Manual assignment doesn't validate when you don't select a user for the next task SOLVED
This commit is contained in:
julceslauhub
2014-01-22 09:52:46 -08:00
parent 6c40f4e90a 02bb9e3e0f
commit efa02ecc01
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/methods/cases/cases_Step.php
View File

@@ -2,12 +2,12 @@
if (!isset($_SESSION['USER_LOGGED'])) { if (!isset($_SESSION['USER_LOGGED'])) {
G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
die( '<script type="text/javascript"> die( '<script type="text/javascript">
try try
{ {
prnt = parent.parent; prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err) catch (err)
{ {
parent.location = parent.location; parent.location = parent.location;
} }
@@ -842,6 +842,7 @@ try {
} }
break; break;
case '': //when this task is the Finish process case '': //when this task is the Finish process
case 'nobody':
$userFields = $oDerivation->getUsersFullNameFromArray( $aFields['TASK'][$sKey]['USER_UID'] ); $userFields = $oDerivation->getUsersFullNameFromArray( $aFields['TASK'][$sKey]['USER_UID'] );
$aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME']; $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME'];
$aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true; $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true;

2
workflow/engine/templates/cases/cases_ScreenDerivation.html
View File

@@ -274,7 +274,7 @@
} else { } else {
var selectId = "form[TASKS]["+optionSelect+"][USR_UID]"; var selectId = "form[TASKS]["+optionSelect+"][USR_UID]";
if (typeof(document.getElementById(selectId)) != 'undefined' && document.getElementById(selectId) != null && userHidden == '') { if (typeof(document.getElementById(selectId)) != 'undefined' && document.getElementById(selectId) != null && (rouType == 'SELECT' || userHidden == '')) {
var vtext = new input(document.getElementById(selectId)); var vtext = new input(document.getElementById(selectId));
// verify value select the option select // verify value select the option select