From 0040e2d00544bb0953e799791293f7a42bad163b Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Mon, 7 May 2012 14:33:41 -0400
Subject: [PATCH] BUG 0000 "Calendar edit bug fixes"

---
 workflow/engine/controllers/admin.php         |  1 +
 workflow/engine/controllers/adminProxy.php    | 23 +++++++++++--------
 .../engine/templates/admin/calendarEdit.js    | 15 +++++-------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php
index 5c3fbd2a3..e129a18ba 100644
--- a/workflow/engine/controllers/admin.php
+++ b/workflow/engine/controllers/admin.php
@@ -97,6 +97,7 @@ class Admin extends Controller
     if ((isset ( $_GET ['cp'] )) && ($_GET ['cp'] == 1)) { // Copy Calendar
       $fields ['CALENDAR_UID'] = G::GenerateUniqueID ();
       $fields ['CALENDAR_NAME'] = G::LoadTranslation ( "ID_COPY_OF" ) . " " . $fields ['CALENDAR_NAME'];
+      $fields ['OLD_NAME'] = $fields['CALENDAR_NAME'];;
     }
     
     $c = new Configurations();
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 66e8276a7..f0126f066 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -143,31 +143,34 @@ class adminProxy extends HttpProxyController
   }
 
   function calendarValidate($httpData) {
-    $httpData=array_unique((array)$httpData);
+    
     $message = '';
-    $oldName = isset($httpData['oldName'])? $httpData['oldName']:'';    
-    switch ($httpData['action']){
+    $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';    
+    
+    switch ($_POST['action']){
       case 'calendarName':
         require_once ('classes/model/CalendarDefinition.php');
         $oCalendar  = new CalendarDefinition();
         $aCalendars = $oCalendar->getCalendarList(false,true); 
         $aCalendarDefinitions = end($aCalendars);
+
         foreach($aCalendarDefinitions as $aDefinitions) {
           if (trim($_POST['name'])==''){
             $validated = false;
             $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
             break;
           }
-          if ($aDefinitions['CALENDAR_NAME']!=$httpData['name']){
+          if ($aDefinitions['CALENDAR_NAME'] != $_POST['name']){
             $validated = true;
-          } else {
-            if ($aDefinitions['CALENDAR_NAME']!=$oldName) {
-            $validated = false;
-            $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
-            break;
+          } 
+          else {
+            if ($aDefinitions['CALENDAR_NAME'] != $oldName) {
+              $validated = false;
+              $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
+              break;
+            }
           }
         }
-        }
         break;
       case 'calendarDates':
         $validated = false;
diff --git a/workflow/engine/templates/admin/calendarEdit.js b/workflow/engine/templates/admin/calendarEdit.js
index 560585695..19f36e9bc 100644
--- a/workflow/engine/templates/admin/calendarEdit.js
+++ b/workflow/engine/templates/admin/calendarEdit.js
@@ -742,18 +742,15 @@ Ext.onReady( function() {
                       listeners: {
                         change: function(){                          
                           Ext.getCmp('idInvalidCalendarName').hide();
-     		           var validateMessage = '';                          
+     		                  var validateMessage = '';                          
                           var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
-                          var oldName = '';
-                          if (name!='') {
-                            oldName = '&oldName='+name;
-                          }
+                          
                           Ext.Ajax.request( {
                             url: '../adminProxy/calendarValidate',
                             params: {
                               action : 'calendarName',
-                              oldName : "",
-                              name : canlendarName                             
+                              oldName : fields.OLD_NAME,
+                              name : canlendarName
                             },
                             success: function(resp){                              
                               if (resp.responseText != '[]')
@@ -1181,7 +1178,7 @@ Ext.onReady( function() {
                         url: '../adminProxy/calendarValidate',
                         params: {
                           action : 'calendarName',
-                          oldName : "",
+                          oldName : fields.OLD_NAME,
                           name : canlendarName                             
                         },
                         success: function(resp){
@@ -1310,7 +1307,7 @@ Ext.onReady( function() {
       url: '../adminProxy/calendarValidate',
       params: {
         action : 'calendarName',
-        oldName : "",
+        oldName : fields.OLD_NAME,
         name : canlendarName                             
       },
       success: function(resp){