From dfd2ff7534778def8a77b1f935f6c4d4e7b00e79 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 25 Sep 2012 12:59:56 -0400 Subject: [PATCH] BUG 8776 Required fields message: field names instead of labels SOLVED - In the validation don't get the pm:label for the field of type textarea and dropdown - Get correctly the labels --- gulliver/js/form/core/form.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index e0d891fe2..391a3851f 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -2741,7 +2741,12 @@ var validateGridForms = function(invalidFields){ var vtext = new input(textAreas[i]); if (textAreas[i].getAttribute("pm:required")=="1"&&textAreas[i].value==''){ $label = textAreas[i].name.split("["); - $fieldName = $label[3].split("]")[0]+ " " + $label[2].split("]")[0]; + $labelPM = textAreas[i].getAttribute("pm:label"); + if ($labelPM == '' || $labelPM == null){ + $fieldName = $label[3].split("]")[0]+ " " + $label[2].split("]")[0]; + }else{ + $fieldName = $labelPM + " " + $label[2].split("]")[0]; + } fieldGridName = $label[1] + "[" + $label[2] + "[" + $label[3].split("]")[0]; if (!notValidateThisFields.inArray(fieldGridName)) { @@ -2760,7 +2765,12 @@ var validateGridForms = function(invalidFields){ if (dropdowns[i].getAttribute("pm:required")=="1"&&dropdowns[i].value==''){ $label = dropdowns[i].name.split("["); - $fieldName = $label[3].split("]")[0]+ " " + $label[2].split("]")[0]; + $labelPM = dropdowns[i].getAttribute("pm:label"); + if ($labelPM == '' || $labelPM == null){ + $fieldName = $label[3].split("]")[0]+ " " + $label[2].split("]")[0]; + }else{ + $fieldName = $labelPM + " " + $label[2].split("]")[0]; + } fieldGridName = $label[1] + "[" + $label[2] + "[" + $label[3].split("]")[0]; if (!notValidateThisFields.inArray(fieldGridName)) {