fernando/luos
1
0
Fork 0
Code Releases Activity

Fixes, adding corrections to the validation for the name field in the calendar Edit form

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2011-01-04 20:08:48 +00:00
parent 0ba75c263d
commit 598099469e
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/setup/calendarEdit.php
View File

@@ -39,10 +39,12 @@ G::LoadClass ( 'calendar' );
$calendarObj = new calendar ( );
if ((isset ( $_GET ['id'] )) && ($_GET ['id'] != "")) {
$fields = $calendarObj->getCalendarInfo ( $CalendarUid );
$fields ['OLD_NAME'] = $fields['CALENDAR_NAME'];
}
if (! (isset ( $fields ['CALENDAR_UID'] ))) { //For a new Calendar
$fields ['CALENDAR_UID'] = $CalendarUid;
$fields ['OLD_NAME'] = '';
//Default Business Hour
$fields ['BUSINESS_DAY'] [1] ['CALENDAR_BUSINESS_DAY'] = 7;
$fields ['BUSINESS_DAY'] [1] ['CALENDAR_BUSINESS_START'] = "09:00";

15
workflow/engine/methods/setup/calendarValidate.php
View File

@@ -39,6 +39,8 @@ switch ($RBAC->userCanAccess('PM_SETUP_ADVANCE'))
}
// validating the fields
$message = array();
$oldName = isset($_POST['oldName'])?$_POST['oldName']:'';
switch ($_POST['action']){
case 'calendarName':
require_once ('classes/model/CalendarDefinition.php');
@@ -50,13 +52,20 @@ switch ($_POST['action']){
$aCalendarDefinitions = end($aCalendars);
// var_dump($aCalendarDefinitions);
foreach($aCalendarDefinitions as $aDefinitions) {
if ($aDefinitions['CALENDAR_NAME']!=$_POST['name']){
$validated = true;
} else {
if (trim($_POST['name'])==''){
$validated = false;
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
break;
}
if ($aDefinitions['CALENDAR_NAME']!=$_POST['name']){
$validated = true;
} else {
if ($aDefinitions['CALENDAR_NAME']!=$oldName) {
$validated = false;
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
break;
}
}
}
break;
case 'calendarDates':