From 22239d3bd1559729723ca7e1a716494fec8f2d2d Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Tue, 3 Feb 2015 17:33:40 -0400
Subject: [PATCH 1/2] PM-1396 No es posible actualizar los calendarios.

Se agrego una validacion para verificar diferencia entre nombres
---
 workflow/engine/controllers/adminProxy.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 4e21d091e..a6bd82469 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -178,6 +178,7 @@ class adminProxy extends HttpProxyController
         $message = '';
         $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';
 
+
         switch ($_POST['action']){
             case 'calendarName':
                 require_once ('classes/model/CalendarDefinition.php');
@@ -191,11 +192,14 @@ class adminProxy extends HttpProxyController
                         $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
                         break;
                     }
+                    
                     if (isset($aDefinitions['CALENDAR_NAME'])) {
-                        if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
-                            $validated = false;
-                            $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
-                            break;
+                        if ($oldName != $_POST['name']) {
+                            if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
+                                $validated = false;
+                                $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
+                                break;
+                            }
                         }
                     }
                 }

From ea2cb9384ba58324f4e29ffd5758bfeb8a279045 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Wed, 4 Feb 2015 14:00:50 -0400
Subject: [PATCH 2/2] PM-1396 No es posible actualizar los calendarios

Se agrego validacion para verificar Id del calendario a modificar
---
 workflow/engine/controllers/adminProxy.php      | 7 ++++---
 workflow/engine/templates/admin/calendarEdit.js | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index a6bd82469..ac8f10492 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -177,7 +177,7 @@ class adminProxy extends HttpProxyController
         $httpData=array_unique((array)$httpData);
         $message = '';
         $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';
-
+        $uid = isset($_POST['uid'])? $_POST['uid']:'';
 
         switch ($_POST['action']){
             case 'calendarName':
@@ -185,7 +185,7 @@ class adminProxy extends HttpProxyController
                 $oCalendar  = new CalendarDefinition();
                 $aCalendars = $oCalendar->getCalendarList(false,true);
                 $aCalendarDefinitions = end($aCalendars);
-
+                
                 foreach ($aCalendarDefinitions as $aDefinitions) {
                     if (trim($_POST['name'])=='') {
                         $validated = false;
@@ -194,7 +194,8 @@ class adminProxy extends HttpProxyController
                     }
                     
                     if (isset($aDefinitions['CALENDAR_NAME'])) {
-                        if ($oldName != $_POST['name']) {
+                        
+                        if ($aDefinitions['CALENDAR_UID'] != $uid) {
                             if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
                                 $validated = false;
                                 $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
diff --git a/workflow/engine/templates/admin/calendarEdit.js b/workflow/engine/templates/admin/calendarEdit.js
index c4fc512b2..618a533ae 100644
--- a/workflow/engine/templates/admin/calendarEdit.js
+++ b/workflow/engine/templates/admin/calendarEdit.js
@@ -757,13 +757,13 @@ Ext.onReady( function() {
                           Ext.getCmp('idInvalidCalendarName').hide();
      		                  var validateMessage = '';
                           var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
-
                           Ext.Ajax.request( {
                             url: '../adminProxy/calendarValidate',
                             params: {
                               action : 'calendarName',
                               oldName : fields.OLD_NAME,
-                              name : canlendarName
+                              name : canlendarName,
+                              uid : fields.CALENDAR_UID
                             },
                             success: function(resp){
                               if (resp.responseText != '[]')