Fixes, adding corrections to the validation for the name field in the calendar Edit form

workflow/engine/xmlform/setup/calendarEdit.html

@@ -10,6 +10,9 @@
            <table border="0" cellpadding="0" cellspacing="0" width="100%">
                                   <tbody><tr style="display: none;">
               <td colspan="2">{$form.CALENDAR_UID}</td>
+             </tr>
+             <tbody><tr style="display: none;">
+               <td colspan="2">{$form.OLD_NAME}</td>
              </tr>
                                                <tr>
               <td class="FormTitle" colspan="2" align="">{$form.DEFINITION_TITLE}</td>

workflow/engine/xmlform/setup/calendarEdit.xml

@@ -4,6 +4,9 @@
     <en>Ndar Uid
   </en>
   </CALENDAR_UID>
+<OLD_NAME type="hidden" size='32' maxlength='32' >
+</OLD_NAME>
+
   <DEFINITION_TITLE type="title" enablehtml="0">
     <en><![CDATA[Calendar Definition]]></en>
   </DEFINITION_TITLE>
@@ -16,6 +19,7 @@
   <CALENDAR_STATUS type="checkbox" value="ACTIVE" falsevalue="INACTIVE" defaultvalue="ACTIVE" labelonright="1" enablehtml="0">
     <en><![CDATA[Active]]></en>
   </CALENDAR_STATUS>
+
   <WorkDays type="title" enablehtml="0">
     <en><![CDATA[Work Days]]></en>
   </WorkDays>
@@ -68,8 +72,13 @@ function submit1 () {
   return validateForm(this.form);
 }
 
-function submit2 (){
-  invalidCalendarName = validateCalendarName();
+function submit2 () {
+  if (getField('OLD_NAME').value==''){
+    invalidCalendarName = validateCalendarName('');
+  } else {
+    invalidCalendarName = validateCalendarName(getField('OLD_NAME').value);
+  }
+
   var startHourMessage= '';
   var endHourMessage='';
   var invalidNameMessage = '';
@@ -409,12 +418,18 @@ function cancel(){
     window.location = 'calendarList';
 }
 
-function validateCalendarName(){
+function validateCalendarName(name){
   var validateMessage = '';
+  var oldName = '';
+  if (name!='') {
+    oldName = '&oldName='+name;
+  }
+  var arguments = 'action=calendarName&name='+getField("CALENDAR_NAME").value+oldName;
+
   var oRPC = new leimnud.module.rpc.xmlhttp({
     url   : 'calendarValidate',
     async : false,
-    args  : 'action=calendarName&name='+getField("CALENDAR_NAME").value
+    args  : arguments
   });
   oRPC.make();
   validateMessage=oRPC.xmlhttp.responseText;