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

correction bug, two alerts were showed into of calendar

Browse Source
This commit is contained in:
Carlos Pacha
2011-01-05 23:08:21 +00:00
parent 1a861171f9
commit 693ea10113
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/xmlform/setup/calendarEdit.xml
View File

@@ -42,7 +42,7 @@
<en><![CDATA[Holidays]]></en> <en><![CDATA[Holidays]]></en>
</HOLIDAY_LABEL> </HOLIDAY_LABEL>
<HOLIDAY type="grid" xmlgrid="setup/calendarEdit_Holidays" addrow="1" deleterow="1"/> <HOLIDAY type="grid" xmlgrid="setup/calendarEdit_Holidays" addrow="1" deleterow="1"/>
<SUBMIT type="submit" onclick="submit1(this);"> <SUBMIT type="button" onclick="submit1(this);">
<en><![CDATA[Save]]></en> <en><![CDATA[Save]]></en>
</SUBMIT> </SUBMIT>
<SUBMIT2 type="button" onclick="submit2(); "> <SUBMIT2 type="button" onclick="submit2(); ">
@@ -69,7 +69,7 @@ function submit1 () {
getField('CALENDAR_WORK_DAYS][6').disabled=false; getField('CALENDAR_WORK_DAYS][6').disabled=false;
getField('CALENDAR_STATUS').disabled=false; getField('CALENDAR_STATUS').disabled=false;
getField('CALENDAR_NAME').disabled=false; getField('CALENDAR_NAME').disabled=false;
return validateForm(this.form); validateForm(this.form);
} }
function submit2 () { function submit2 () {
@@ -358,7 +358,8 @@ function validateForm(form){
} }
getField('CALENDAR_NAME').value=getField('CALENDAR_NAME').value.trim(); getField('CALENDAR_NAME').value=getField('CALENDAR_NAME').value.trim();
if(getField('CALENDAR_NAME').value==""){ if(getField('CALENDAR_NAME').value==""){
msg+="- Invalid Name \n"; msg+=G_STRINGS.ID_REQUIRED_FIELDS + ": \n\n ";
msg+="- "+ '@G::LoadTranslation(ID_NAME)' +" \n";
} }
var flag=true; var flag=true;
var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START"); var rowsHoliday=Number_Rows_Grid("HOLIDAY", "CALENDAR_HOLIDAY_START");
@@ -371,14 +372,17 @@ function validateForm(form){
} }
} }
if(!flag){ if(!flag){
msgBox(G_STRINGS.ID_REQUIRED_FIELDS + ": \n "+G_STRINGS.ID_START_DATE,"alert"); return false; if(!flag && getField('CALENDAR_NAME').value!=""){ msg+=G_STRINGS.ID_REQUIRED_FIELDS + ": \n\n ";}
//msgBox(G_STRINGS.ID_REQUIRED_FIELDS + ": \n "+G_STRINGS.ID_START_DATE,"alert"); return false;
msg +="- "+G_STRINGS.ID_START_DATE+"\n";
} }
if(msg!=""){ if(msg!=""){
//msgBox(msg,"alert");
alert(msg); alert(msg);
return false; return false;
} }
document.CalendarDefinition.submit();
return true; //return true;
} }