fernando/luos
1
0
Fork 0
Code Releases Activity

Revert "Se agrega validacion para el campo out_doc_pdf_security_permissions en OUTPUTDOCUMENTS"

Browse Source 
This reverts commit f267111d6b49ec5fa8088a785dfac4da6ec409a1.
This commit is contained in:
Freddy Daniel Rojas Valda
2014-01-15 14:51:32 -04:00
parent 2e57274661
commit 76141f1593
4 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -41,7 +41,7 @@ class CaseScheduler extends BaseCaseScheduler
} }
public function create ($aData) public function create ($aData)
{var_dump($aData); die('daniel'); {
$con = Propel::getConnection( CaseSchedulerPeer::DATABASE_NAME ); $con = Propel::getConnection( CaseSchedulerPeer::DATABASE_NAME );
try { try {
$this->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aData, BasePeer::TYPE_FIELDNAME );

5
workflow/engine/methods/cases/cases_Scheduler_Save.php
View File

@@ -158,13 +158,12 @@ try {
$sValue = $nStartDay; $sValue = $nStartDay;
break; break;
} }
//echo "<br>sOption: " . $sOption; echo "<br>sOption: " . $sOption;
if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) { if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
if ($sStartDay == '') { if ($sStartDay == '') {
$sStartDay = date( 'Y-m-d' ); $sStartDay = date( 'Y-m-d' );
} }
echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask." 5*". $sWeeks." 6*". $sStartDay ." 7*". $sMonths."<br>"; // echo $sOption."*". $sValue."*". $nActualTime."*". $sDaysPerformTask."*". $sWeeks."*". $sStartDay ."*". $sMonths."<br>";
die();
$dCurrentDay = date( "d" ); $dCurrentDay = date( "d" );
$dCurrentMonth = date( "m" ); $dCurrentMonth = date( "m" );
$aStartDay = explode( "|", $aData['SCH_START_DAY'] ); $aStartDay = explode( "|", $aData['SCH_START_DAY'] );

48
workflow/engine/src/BusinessModel/CaseScheduler.php
View File

@@ -167,7 +167,8 @@ class CaseScheduler
$aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; //check $aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; //check
break; break;
case '3': // Every [n] Days case '3': // Every [n] Days
$sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK']; $sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK_OPT_3'];
$aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'] . '|' . $aData['SCH_DAYS_PERFORM_TASK_OPT_3'];
break; break;
} }
break; break;
@@ -181,7 +182,15 @@ class CaseScheduler
$sWeeks = ''; $sWeeks = '';
if (! empty( $aData['SCH_WEEK_DAYS'] )) { if (! empty( $aData['SCH_WEEK_DAYS'] )) {
$aWeekDays = $aData['SCH_WEEK_DAYS']; $aWeekDays = $aData['SCH_WEEK_DAYS'];
$sWeeks = $aData['SCH_WEEK_DAYS']; foreach ($aWeekDays as $value) {
$sWeeks = $sWeeks . $value . '|';
}
}
if (! empty( $aData['SCH_WEEK_DAYS_2'] )) {
$aWeekDays2 = $aData['SCH_WEEK_DAYS_2'];
foreach ($aWeekDays2 as $value) {
$sWeeks = $sWeeks . $value . '|';
}
} }
$sStartTime = $aData['SCH_START_TIME']; $sStartTime = $aData['SCH_START_TIME'];
$aData['SCH_WEEK_DAYS'] = $sWeeks; $aData['SCH_WEEK_DAYS'] = $sWeeks;
@@ -218,8 +227,6 @@ class CaseScheduler
$sValue = $nStartDay; $sValue = $nStartDay;
break; break;
} }
//echo $aData['SCH_END_DATE']; die();
//echo $aData['SCH_TIME_NEXT_RUN']; die();
if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) { if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
if ($sStartDay == '') { if ($sStartDay == '') {
$sStartDay = date( 'Y-m-d' ); $sStartDay = date( 'Y-m-d' );
@@ -239,12 +246,14 @@ class CaseScheduler
} }
} }
} else { } else {
/* echo $sOption; echo " - ";
echo $sValue; echo " - "; echo $nActualTime; echo " - "; echo $sDaysPerformTask; echo " - "; echo $sWeeks;
echo " - "; echo $sStartDay; echo " - "; echo $sMonths; echo " - "; echo $sDateTmp; die();
echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask." 5*". $sWeeks." 6*". $sStartDay ." 7*". $sMonths."<br>"; die(); */
// echo $aData['SCH_END_DATE']; die(); echo $sOption."*". $sValue."*". $nActualTime."*". $sDaysPerformTask."*". $sWeeks."*". $sStartDay ."*". $sMonths."<br>";
//echo $aData['SCH_TIME_NEXT_RUN']; die();
$aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp ); $aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp );
echo $aData['SCH_TIME_NEXT_RUN']; die ();
} }
} else { } else {
@@ -265,11 +274,9 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
$aData['SCH_TIME_NEXT_RUN'] = $date; $aData['SCH_TIME_NEXT_RUN'] = $date;
} }
} }
if (trim( $aData['SCH_END_DATE'] ) != '') { if (trim( $aData['SCH_END_DATE'] ) != '') {
$aData['SCH_END_DATE'] = $aData['SCH_END_DATE']; $aData['SCH_END_DATE'] = $aData['SCH_END_DATE'];
} }
if (! empty( $aData['SCH_REPEAT_TASK_CHK'] )) { if (! empty( $aData['SCH_REPEAT_TASK_CHK'] )) {
$nOptEvery = $aData['SCH_REPEAT_EVERY_OPT']; $nOptEvery = $aData['SCH_REPEAT_EVERY_OPT'];
if ($nOptEvery == 2) { if ($nOptEvery == 2) {
@@ -281,7 +288,6 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
if ((isset( $aData['CASE_SH_PLUGIN_UID'] )) && ($aData['CASE_SH_PLUGIN_UID'] != "")) { if ((isset( $aData['CASE_SH_PLUGIN_UID'] )) && ($aData['CASE_SH_PLUGIN_UID'] != "")) {
$aData['CASE_SH_PLUGIN_UID'] = $aData['CASE_SH_PLUGIN_UID']; $aData['CASE_SH_PLUGIN_UID'] = $aData['CASE_SH_PLUGIN_UID'];
} }
// echo $aData['SCH_END_DATE']; die();
$oCaseScheduler->create( $aData ); $oCaseScheduler->create( $aData );
$oCriteria = $this->getCaseScheduler($sProcessUID, $aData['SCH_UID']); $oCriteria = $this->getCaseScheduler($sProcessUID, $aData['SCH_UID']);
return $oCriteria; return $oCriteria;
@@ -321,8 +327,8 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
$sTimeTmp = $aData['SCH_START_TIME']; $sTimeTmp = $aData['SCH_START_TIME'];
// $aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) ); // $aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
// $aData['SCH_START_DATE'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) ); // $aData['SCH_START_DATE'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
// $previousStartTime = date( 'Y-m-d', strtotime( $aData['PREV_SCH_START_DATE'] ) ) . ' ' . date( 'H:i:s', strtotime( $aData['PREV_SCH_START_TIME'] ) ); $previousStartTime = date( 'Y-m-d', strtotime( $aData['PREV_SCH_START_DATE'] ) ) . ' ' . date( 'H:i:s', strtotime( $aData['PREV_SCH_START_TIME'] ) );
// $previousStartDate = date( 'Y-m-d', strtotime( $aData['PREV_SCH_START_DATE'] ) ) . ' ' . date( 'H:i:s', strtotime( $aData['PREV_SCH_START_TIME'] ) ); $previousStartDate = date( 'Y-m-d', strtotime( $aData['PREV_SCH_START_DATE'] ) ) . ' ' . date( 'H:i:s', strtotime( $aData['PREV_SCH_START_TIME'] ) );
$sValue = ''; $sValue = '';
$sDaysPerformTask = ''; $sDaysPerformTask = '';
$sWeeks = ''; $sWeeks = '';
@@ -344,8 +350,8 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
$aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; $aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|';
break; break;
case '3': // Every [n] Days case '3': // Every [n] Days
$sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK']; $sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK_OPT_3'];
$aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK']; $aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'] . '|' . $aData['SCH_DAYS_PERFORM_TASK_OPT_3'];
break; break;
} }
break; break;
@@ -360,7 +366,15 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
$sWeeks = ''; $sWeeks = '';
if (! empty( $aData['SCH_WEEK_DAYS'] )) { if (! empty( $aData['SCH_WEEK_DAYS'] )) {
$aWeekDays = $aData['SCH_WEEK_DAYS']; $aWeekDays = $aData['SCH_WEEK_DAYS'];
$sWeeks = $aData['SCH_WEEK_DAYS']; foreach ($aWeekDays as $value) {
$sWeeks = $sWeeks . $value . '|';
}
}
if (! empty( $aData['SCH_WEEK_DAYS_2'] )) {
$aWeekDays2 = $aData['SCH_WEEK_DAYS_2'];
foreach ($aWeekDays2 as $value) {
$sWeeks = $sWeeks . $value . '|';
}
} }
$sStartTime = $aData['SCH_START_TIME']; $sStartTime = $aData['SCH_START_TIME'];
$aData['SCH_WEEK_DAYS'] = $sWeeks; $aData['SCH_WEEK_DAYS'] = $sWeeks;
@@ -398,7 +412,6 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
break; break;
} }
echo $aData['SCH_END_DATE']; die();
if (trim( $aData['SCH_END_DATE'] ) != '') { if (trim( $aData['SCH_END_DATE'] ) != '') {
$aData['SCH_END_DATE'] = $aData['SCH_END_DATE']; $aData['SCH_END_DATE'] = $aData['SCH_END_DATE'];
} }
@@ -441,7 +454,6 @@ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask."
} }
} }
} }
echo $sOption."*". $sValue."*". $nActualTime."*". $sDaysPerformTask."*". $sWeeks."*". $sStartDay ."*". $sMonths."<br>"; die();
} else { } else {
if ($recalculateDate) { if ($recalculateDate) {
$aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp ); $aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp );

21
workflow/engine/src/BusinessModel/OutputDocument.php
View File

@@ -228,15 +228,6 @@ class OutputDocument
*/ */
public function addOutputDocument($sProcessUID, $aData) public function addOutputDocument($sProcessUID, $aData)
{ {
$pemission = $aData['out_doc_pdf_security_permissions'];
$pemission = explode("|", $pemission);
foreach ($pemission as $row) {
if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms") {
$aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions'];
} else {
throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`'));
}
}
try { try {
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
$aData = array_change_key_case($aData, CASE_UPPER); $aData = array_change_key_case($aData, CASE_UPPER);
@@ -283,17 +274,7 @@ class OutputDocument
* @access public * @access public
*/ */
public function updateOutputDocument($sProcessUID, $sOutputDocumentUID = '', $aData) public function updateOutputDocument($sProcessUID, $sOutputDocumentUID = '', $aData)
{ { $oConnection = \Propel::getConnection(\OutputDocumentPeer::DATABASE_NAME);
$oConnection = \Propel::getConnection(\OutputDocumentPeer::DATABASE_NAME);
$pemission = $aData['out_doc_pdf_security_permissions'];
$pemission = explode("|", $pemission);
foreach ($pemission as $row) {
if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms") {
$aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions'];
} else {
throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`'));
}
}
try { try {
$aData = array_change_key_case($aData, CASE_UPPER); $aData = array_change_key_case($aData, CASE_UPPER);
$oOutputDocument = \OutputDocumentPeer::retrieveByPK($sOutputDocumentUID); $oOutputDocument = \OutputDocumentPeer::retrieveByPK($sOutputDocumentUID);