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

BUG 0000 "Calendar edit bug fixes"

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2012-05-07 14:33:41 -04:00
committed by Erik Amaru Ortiz
parent df18d8c3ff
commit 0040e2d005
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/controllers/admin.php
View File

@@ -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();

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

@@ -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;

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

@@ -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){