From 602e1830ad26671f8b0650e13a518b9fd80c54b5 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 6 Jul 2012 12:09:36 -0400 Subject: [PATCH] BUG 9333 Don't work in IE and google chrome SOLVED - I validate to all browser --- .../cases/cases_ScreenDerivation.html | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/workflow/engine/templates/cases/cases_ScreenDerivation.html b/workflow/engine/templates/cases/cases_ScreenDerivation.html index 1a0d0a759..bc58a20da 100755 --- a/workflow/engine/templates/cases/cases_ScreenDerivation.html +++ b/workflow/engine/templates/cases/cases_ScreenDerivation.html @@ -1,5 +1,5 @@
-
+
@@ -54,7 +54,7 @@ {if $PROCESS.ROU_TYPE eq 'SELECT'} - + {$OPTION_LABEL} {$id}: {$data.ROU_CONDITION } @@ -130,9 +130,9 @@ {if $data.NEXT_TASK.TAS_ASSIGN_TYPE neq '' && not $data.NEXT_TASK.ROU_FINISH_FLAG } - + {/if} {if $data.NEXT_TASK.TAS_ASSIGN_TYPE neq '' && $data.NEXT_TASK.ROU_FINISH_FLAG } - + {$data.NEXT_TASK.TAS_ASSIGN_TYPE} {/if} @@ -144,14 +144,14 @@ {if $PROCESS.ERROR eq '' && $PROCESS.ROU_TYPE neq 'SELECT' && ! $PROCESS.ROU_FINISH_FLAG } - + {/if} {if $PROCESS.ERROR eq '' && $PROCESS.ROU_TYPE neq 'SELECT' && $PROCESS.ROU_FINISH_FLAG } - + {/if} @@ -194,7 +194,9 @@ var nameButton = obj.name; var pos = nameButton.lastIndexOf("_"); optionSelect = nameButton.substr(pos+1); - + if (validateSubmitForm()) { + obj.form.submit(); + } return true; }; @@ -209,7 +211,7 @@ var submitsForm = document.getElementsByTagName("input"); for (var i = 0 ; i <= submitsForm.length ; i++) { - if (typeof(submitsForm[i]) != 'undefined' && submitsForm[i].type == 'submit') { + if (typeof(submitsForm[i]) != 'undefined' && submitsForm[i].type == 'button') { submitsForm[i].disabled = true; } } @@ -228,7 +230,7 @@ var submitsForm = document.getElementsByTagName("input"); for (var i = 0 ; i <= submitsForm.length ; i++) { - if (typeof(submitsForm[i]) != 'undefined' && submitsForm[i].type == 'submit') { + if (typeof(submitsForm[i]) != 'undefined' && submitsForm[i].type == 'button') { submitsForm[i].disabled = false; } } @@ -271,7 +273,7 @@ } else { var selectId = "form[TASKS]["+optionSelect+"][USR_UID]"; - if (typeof(document.getElementById(selectId)) != 'undefined') { + if (typeof(document.getElementById(selectId)) != 'undefined' && document.getElementById(selectId) != null) { var vtext = new input(document.getElementById(selectId)); // verify value select the option select