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

Merged in norah/processmaker/PM-1396 (pull request #1377)

Browse Source 
PM-1396 No es posible actualizar los calendarios
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-04 14:30:16 -04:00
parent addaae4031 ea2cb9384b
commit d8e0e63ec7
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/controllers/adminProxy.php
View File

@@ -177,6 +177,7 @@ class adminProxy extends HttpProxyController
$httpData=array_unique((array)$httpData); $httpData=array_unique((array)$httpData);
$message = ''; $message = '';
$oldName = isset($_POST['oldName'])? $_POST['oldName']:''; $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';
$uid = isset($_POST['uid'])? $_POST['uid']:'';
switch ($_POST['action']){ switch ($_POST['action']){
case 'calendarName': case 'calendarName':
@@ -184,18 +185,22 @@ class adminProxy extends HttpProxyController
$oCalendar = new CalendarDefinition(); $oCalendar = new CalendarDefinition();
$aCalendars = $oCalendar->getCalendarList(false,true); $aCalendars = $oCalendar->getCalendarList(false,true);
$aCalendarDefinitions = end($aCalendars); $aCalendarDefinitions = end($aCalendars);
foreach ($aCalendarDefinitions as $aDefinitions) { foreach ($aCalendarDefinitions as $aDefinitions) {
if (trim($_POST['name'])=='') { if (trim($_POST['name'])=='') {
$validated = false; $validated = false;
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); $message = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
break; break;
} }
if (isset($aDefinitions['CALENDAR_NAME'])) { if (isset($aDefinitions['CALENDAR_NAME'])) {
if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
$validated = false; if ($aDefinitions['CALENDAR_UID'] != $uid) {
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME'); if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
break; $validated = false;
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
break;
}
} }
} }
} }

4
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -757,13 +757,13 @@ Ext.onReady( function() {
Ext.getCmp('idInvalidCalendarName').hide(); Ext.getCmp('idInvalidCalendarName').hide();
var validateMessage = ''; var validateMessage = '';
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue(); var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
Ext.Ajax.request( { Ext.Ajax.request( {
url: '../adminProxy/calendarValidate', url: '../adminProxy/calendarValidate',
params: { params: {
action : 'calendarName', action : 'calendarName',
oldName : fields.OLD_NAME, oldName : fields.OLD_NAME,
name : canlendarName name : canlendarName,
uid : fields.CALENDAR_UID
}, },
success: function(resp){ success: function(resp){
if (resp.responseText != '[]') if (resp.responseText != '[]')