From 93bba931ca04ff29b60e4d33966e04a855def61b Mon Sep 17 00:00:00 2001 From: norahmollo Date: Thu, 16 Oct 2014 16:30:45 -0400 Subject: [PATCH] PM-527 Calendarios con el mismo nombre Al realizar la copia de calendarios se pueden crear calendarios con el mismo nombre --- workflow/engine/controllers/adminProxy.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 76524d9e1..338607e0a 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -178,7 +178,7 @@ class adminProxy extends HttpProxyController $httpData=array_unique((array)$httpData); $message = ''; $oldName = isset($_POST['oldName'])? $_POST['oldName']:''; - + switch ($_POST['action']){ case 'calendarName': require_once ('classes/model/CalendarDefinition.php'); @@ -193,14 +193,10 @@ class adminProxy extends HttpProxyController break; } if (isset($aDefinitions['CALENDAR_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; - } + if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) { + $validated = false; + $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); + break; } } }