fernando/luos
1
0
Fork 0
Code Releases Activity

CODE STYLE and fixing two behat test

Browse Source
This commit is contained in:
Fernando Ontiveros
2014-01-25 06:36:45 -04:00
parent 5fc22fbef8
commit 9fcdf30491
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,7 +302,7 @@ class CaseScheduler
$nSW = 0; $nSW = 0;
$aData['SCH_DAYS_PERFORM_TASK'] = ''; $aData['SCH_DAYS_PERFORM_TASK'] = '';
switch ($sOption) { switch ($sOption) {
case '1': case '1':
// Option 1 // Option 1
$aData['SCH_DAYS_PERFORM_TASK'] = '1'; $aData['SCH_DAYS_PERFORM_TASK'] = '1';
$sValue = $aData['SCH_DAYS_PERFORM_TASK']; $sValue = $aData['SCH_DAYS_PERFORM_TASK'];
@@ -549,7 +549,7 @@ class CaseScheduler
$nSW = 0; $nSW = 0;
$aData['SCH_DAYS_PERFORM_TASK'] = ''; $aData['SCH_DAYS_PERFORM_TASK'] = '';
switch ($sOption) { switch ($sOption) {
case '1': case '1':
// Option 1 // Option 1
$aData['SCH_DAYS_PERFORM_TASK'] = '1'; $aData['SCH_DAYS_PERFORM_TASK'] = '1';
$sValue = $aData['SCH_DAYS_PERFORM_TASK']; $sValue = $aData['SCH_DAYS_PERFORM_TASK'];

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

@@ -28,7 +28,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TOP_MARGIN); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TOP_MARGIN);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_GENERATE); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_GENERATE);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TYPE); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TYPE);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_CURRENT_REVISION); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_CURRENT_REVISION);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FIELD_MAPPING); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FIELD_MAPPING);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_VERSIONING); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_VERSIONING);
@@ -45,7 +45,7 @@ class OutputDocument
$oCriteria->addAlias('C1', 'CONTENT'); $oCriteria->addAlias('C1', 'CONTENT');
$oCriteria->addAlias('C2', 'CONTENT'); $oCriteria->addAlias('C2', 'CONTENT');
$oCriteria->addAlias('C3', 'CONTENT'); $oCriteria->addAlias('C3', 'CONTENT');
$oCriteria->addAlias('C4', 'CONTENT'); $oCriteria->addAlias('C4', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' ); $aConditions[] = array(\OutputDocumentPeer::OUT_DOC_UID, 'C1.CON_ID' );
$aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter ); $aConditions[] = array('C1.CON_CATEGORY', $sDelimiter . 'OUT_DOC_TITLE' . $sDelimiter );
@@ -135,7 +135,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TOP_MARGIN); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TOP_MARGIN);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_BOTTOM_MARGIN);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_GENERATE); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_GENERATE);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TYPE); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_TYPE);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_CURRENT_REVISION); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_CURRENT_REVISION);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FIELD_MAPPING); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_FIELD_MAPPING);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_VERSIONING); $oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_VERSIONING);
@@ -228,7 +228,7 @@ class OutputDocument
* @access public * @access public
*/ */
public function addOutputDocument($sProcessUID, $aData) public function addOutputDocument($sProcessUID, $aData)
{ {
$pemission = $aData['out_doc_pdf_security_permissions']; $pemission = $aData['out_doc_pdf_security_permissions'];
$pemission = explode("|", $pemission); $pemission = explode("|", $pemission);
foreach ($pemission as $row) { foreach ($pemission as $row) {
@@ -246,7 +246,7 @@ class OutputDocument
$process = new \Process(); $process = new \Process();
if (!$process->exists($sProcessUID)) { if (!$process->exists($sProcessUID)) {
throw (new \Exception(str_replace(array("{0}", "{1}"), array($sProcessUID, "PROCESS"), "The UID \"{0}\" doesn't exist in table {1}"))); throw (new \Exception(str_replace(array("{0}", "{1}"), array($sProcessUID, "PROCESS"), "The UID \"{0}\" doesn't exist in table {1}")));
} }
if ($aData["OUT_DOC_TITLE"]=="") { if ($aData["OUT_DOC_TITLE"]=="") {
throw (new \Exception( 'invalid value specified for `out_doc_title`, can`t be null')); throw (new \Exception( 'invalid value specified for `out_doc_title`, can`t be null'));
} }
@@ -344,14 +344,14 @@ class OutputDocument
* @access public * @access public
*/ */
public function deleteOutputDocument($sProcessUID, $sOutputDocumentUID) public function deleteOutputDocument($sProcessUID, $sOutputDocumentUID)
{ {
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");
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ObjectPermission.php"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ObjectPermission.php");
require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Step.php"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Step.php");
\G::LoadClass( 'processMap' ); \G::LoadClass( 'processMap' );
$oOutputDocument = new \OutputDocument(); $oOutputDocument = new \OutputDocument();
$fields = $oOutputDocument->load( $sOutputDocumentUID ); $fields = $oOutputDocument->load( $sOutputDocumentUID );
$oOutputDocument->remove( $sOutputDocumentUID ); $oOutputDocument->remove( $sOutputDocumentUID );
$oStep = new \Step(); $oStep = new \Step();
$oStep->removeStep( 'OUTPUT_DOCUMENT', $sOutputDocumentUID ); $oStep->removeStep( 'OUTPUT_DOCUMENT', $sOutputDocumentUID );
@@ -388,7 +388,7 @@ class OutputDocument
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\ContentPeer::CON_VALUE, $title, \Criteria::EQUAL); $criteria->add(\ContentPeer::CON_VALUE, $title, \Criteria::EQUAL);
$rsCriteria = \OutputDocumentPeer::doSelectRS($criteria); $rsCriteria = \OutputDocumentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
return true; return true;

42
workflow/engine/src/Services/Api/ProcessMaker/Project/ProcessPermissions.php
View File

@@ -85,17 +85,17 @@ class ProcessPermissions extends Api
* @status 201 * @status 201
*/ */
public function doPostProcessPermission( public function doPostProcessPermission(
$projectUid, $projectUid,
$request_data, $request_data,
$usr_uid, $usr_uid,
$op_user_relation, $op_user_relation,
$op_case_status, $op_case_status,
$op_participate, $op_participate,
$op_obj_type, $op_obj_type,
$op_action, $op_action,
$tas_uid = '', $tas_uid = '',
$op_task_source = '', $op_task_source = '',
$dynaforms = '', $dynaforms = '',
$inputs = '', $inputs = '',
$outputs = '' $outputs = ''
) { ) {
@@ -143,19 +143,19 @@ class ProcessPermissions extends Api
* @url PUT /:projectUid/process-permission/:objectPermissionUid * @url PUT /:projectUid/process-permission/:objectPermissionUid
*/ */
public function doPutProcessPermission( public function doPutProcessPermission(
$projectUid, $projectUid,
$objectPermissionUid, $objectPermissionUid,
$request_data, $request_data,
$usr_uid, $usr_uid,
$op_user_relation, $op_user_relation,
$op_case_status, $op_case_status,
$op_participate, $op_participate,
$op_obj_type, $op_obj_type,
$op_action, $op_action,
$tas_uid = '', $tas_uid = '',
$op_task_source = '', $op_task_source = '',
$dynaforms = '', $dynaforms = '',
$inputs = '', $inputs = '',
$outputs = '' $outputs = ''
) { ) {
try { try {