From 02bb9e3e0fd0ff3a9eea9c4f5f3ba0bb9aa92c5e Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 22 Jan 2014 13:48:19 -0400
Subject: [PATCH] BUG 13712 Manual assignment doesn't validate when you don't
 select a user for the next task SOLVED

- Incorrect validation when the routing rule is "selection" and the next task assigment type is "manual"

- Fix incorrect validation
---
 workflow/engine/methods/cases/cases_Step.php                | 5 +++--
 workflow/engine/templates/cases/cases_ScreenDerivation.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 7cdf58cfd..80eb5347a 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -2,12 +2,12 @@
 if (!isset($_SESSION['USER_LOGGED'])) {
       G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
       die( '<script type="text/javascript">
-                try 
+                try
                   {
                      prnt = parent.parent;
                      top.location = top.location;
                   }
-                catch (err) 
+                catch (err)
                   {
                      parent.location = parent.location;
                   }
@@ -842,6 +842,7 @@ try {
                         }
                         break;
                     case '': //when this task is the Finish process
+                    case 'nobody':
                         $userFields = $oDerivation->getUsersFullNameFromArray( $aFields['TASK'][$sKey]['USER_UID'] );
                         $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME'];
                         $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true;
diff --git a/workflow/engine/templates/cases/cases_ScreenDerivation.html b/workflow/engine/templates/cases/cases_ScreenDerivation.html
index d4aa642b0..c266f84f3 100755
--- a/workflow/engine/templates/cases/cases_ScreenDerivation.html
+++ b/workflow/engine/templates/cases/cases_ScreenDerivation.html
@@ -274,7 +274,7 @@
     } else {
       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));
 
         // verify value select the option select