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

BUG 9088 "KnowledgeTree and webEntry don't work when we try..." SOLVED

Browse Source 
- KnowledgeTree and webEntry don't work when you try to upload
  some files
- Added the missing code in this section when the KnowledgeTree plugin
  is enabled
This commit is contained in:
Victor Saisa Lopez
2012-06-06 12:00:14 -04:00
parent 0f2891e762
commit 536fee11ca
3 changed files with 161 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
workflow/engine/classes/class.wsBase.php
View File

@@ -1248,6 +1248,16 @@ class wsBase
*/ */
public function newCase($processId, $userId, $taskId, $variables) { public function newCase($processId, $userId, $taskId, $variables) {
try { try {
//GET, POST & $_SESSION Vars
//Unset any variable, because we are starting a new case
if (isset($_SESSION['APPLICATION'])) unset($_SESSION['APPLICATION']);
if (isset($_SESSION['PROCESS'])) unset($_SESSION['PROCESS']);
if (isset($_SESSION['TASK'])) unset($_SESSION['TASK']);
if (isset($_SESSION['INDEX'])) unset($_SESSION['INDEX']);
if (isset($_SESSION['USER_LOGGED'])) unset($_SESSION['USER_LOGGED']);
//if (isset($_SESSION['USR_USERNAME'])) unset($_SESSION['USR_USERNAME']);
//if (isset($_SESSION['STEP_POSITION'])) unset($_SESSION['STEP_POSITION']);
$Fields = array(); $Fields = array();
if ( is_array($variables) && count($variables)>0 ) { if ( is_array($variables) && count($variables)>0 ) {
$Fields = $variables; $Fields = $variables;
@@ -1287,9 +1297,18 @@ class wsBase
return $result; return $result;
} }
$case = $oCase->startCase($taskId, $userId); $case = $oCase->startCase($taskId, $userId);
$caseId = $case['APPLICATION'];
$caseNr = $case['CASE_NUMBER']; $_SESSION['APPLICATION'] = $case['APPLICATION'];
$_SESSION['PROCESS'] = $case['PROCESS'];
$_SESSION['TASK'] = $taskId;
$_SESSION['INDEX'] = $case['INDEX'];
$_SESSION['USER_LOGGED'] = $userId;
//$_SESSION['USR_USERNAME'] = $case['USR_USERNAME'];
//$_SESSION['STEP_POSITION'] = 0;
$caseId = $case['APPLICATION'];
$caseNr = $case['CASE_NUMBER'];
$oldFields = $oCase->loadCase( $caseId ); $oldFields = $oCase->loadCase( $caseId );

182
workflow/engine/methods/services/upload.php
View File

@@ -32,95 +32,125 @@
if (isset($_FILES) && $_FILES['ATTACH_FILE']['error'] == 0) { if (isset($_FILES) && $_FILES['ATTACH_FILE']['error'] == 0) {
try{ try{
G::loadClass('case'); G::LoadClass('case');
$folderId = $fileTags = "";
if ( isset($_POST['DOC_UID']) && $_POST['DOC_UID'] != - 1) {
/* the document is of an Specific Input Document. Get path and Tag information*/
require_once ('classes/model/AppFolder.php'); $folderId = '';
require_once ('classes/model/InputDocument.php'); $fileTags = '';
$oInputDocument = new InputDocument(); if (isset($_POST['DOC_UID']) && $_POST['DOC_UID'] != -1) {
$aID = $oInputDocument->load($_POST['DOC_UID']); //The document is of an Specific Input Document. Get path and Tag information
require_once ('classes/model/AppFolder.php');
require_once ('classes/model/InputDocument.php');
//Get the Custom Folder ID (create if necessary) $oInputDocument = new InputDocument();
$oFolder = new AppFolder(); $aID = $oInputDocument->load($_POST['DOC_UID']);
$folderId = $oFolder->createFromPath($aID['INP_DOC_DESTINATION_PATH'], $_POST['APPLICATION']);
//Tags //Get the Custom Folder ID (create if necessary)
$fileTags = $oFolder->parseTags($aID['INP_DOC_TAGS'], $_POST['APPLICATION']); $oFolder = new AppFolder();
} $folderId = $oFolder->createFromPath($aID['INP_DOC_DESTINATION_PATH'], $_POST['APPLICATION']);
$oAppDocument = new AppDocument(); //Tags
if (isset($_POST['APP_DOC_UID']) && trim($_POST['APP_DOC_UID']) != '') { //is update $fileTags = $oFolder->parseTags($aID['INP_DOC_TAGS'], $_POST['APPLICATION']);
echo '[update]'; }
$aFields['APP_DOC_UID'] = $_POST['APP_DOC_UID'];
$aFields['DOC_VERSION'] = $_POST['DOC_VERSION'];
$aFields['APP_DOC_FILENAME'] = $_FILES['ATTACH_FILE']['name'];
if( isset($_POST['APPLICATION']) ) $oAppDocument = new AppDocument();
$aFields['APP_UID'] = $_POST['APPLICATION'];
if( isset($_POST['INDEX']) )
$aFields['DEL_INDEX'] = $_POST['INDEX'];
if( isset($_POST['USR_UID']) )
$aFields['USR_UID'] = $_POST['USR_UID'];
if( isset($_POST['DOC_UID']) )
$aFields['DOC_UID'] = $_POST['DOC_UID'];
if( isset($_POST['APP_DOC_TYPE']) )
$aFields['APP_DOC_TYPE']= $_POST['APP_DOC_TYPE'];
$aFields['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$aFields['APP_DOC_COMMENT'] = isset($_POST['COMMENT']) ? $_POST['COMMENT'] : ''; if (isset($_POST['APP_DOC_UID']) && trim($_POST['APP_DOC_UID']) != '') {
$aFields['APP_DOC_TITLE'] = isset($_POST['TITLE']) ? $_POST['TITLE'] : ''; //Update
echo '[update]';
$aFields['APP_DOC_UID'] = $_POST['APP_DOC_UID'];
$aFields['DOC_VERSION'] = $_POST['DOC_VERSION'];
$aFields['APP_DOC_FILENAME'] = $_FILES['ATTACH_FILE']['name'];
//$aFields['FOLDER_UID'] = $folderId, if (isset($_POST['APPLICATION']))
//$aFields['APP_DOC_TAGS']= $fileTags $aFields['APP_UID'] = $_POST['APPLICATION'];
if (isset($_POST['INDEX']))
$aFields['DEL_INDEX'] = $_POST['INDEX'];
if (isset($_POST['USR_UID']))
$aFields['USR_UID'] = $_POST['USR_UID'];
if (isset($_POST['DOC_UID']))
$aFields['DOC_UID'] = $_POST['DOC_UID'];
if (isset($_POST['APP_DOC_TYPE']))
$aFields['APP_DOC_TYPE']= $_POST['APP_DOC_TYPE'];
$oAppDocument->create($aFields); $aFields['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$aFields['APP_DOC_COMMENT'] = isset($_POST['COMMENT'])? $_POST['COMMENT'] : '';
$aFields['APP_DOC_TITLE'] = isset($_POST['TITLE'])? $_POST['TITLE'] : '';
} else { //new record //$aFields['FOLDER_UID'] = $folderId,
$aFields = array ( //$aFields['APP_DOC_TAGS']= $fileTags
'APP_UID' => $_POST['APPLICATION'], }
'DEL_INDEX' => $_POST['INDEX'], else {
'USR_UID' => $_POST['USR_UID'], //New record
'DOC_UID' => $_POST['DOC_UID'], $aFields = array(
'APP_DOC_TYPE' => $_POST['APP_DOC_TYPE'], 'APP_UID' => $_POST['APPLICATION'],
'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'), 'DEL_INDEX' => $_POST['INDEX'],
'APP_DOC_COMMENT' => isset($_POST['COMMENT']) ? $_POST['COMMENT'] : '', 'USR_UID' => $_POST['USR_UID'],
'APP_DOC_TITLE' => isset($_POST['TITLE']) ? $_POST['TITLE'] : '', 'DOC_UID' => $_POST['DOC_UID'],
'APP_DOC_FILENAME' => isset($_FILES['ATTACH_FILE']['name']) ? $_FILES['ATTACH_FILE']['name'] : '', 'APP_DOC_TYPE' => $_POST['APP_DOC_TYPE'],
'FOLDER_UID' => $folderId, 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),
'APP_DOC_TAGS' => $fileTags 'APP_DOC_COMMENT' => isset($_POST['COMMENT'])? $_POST['COMMENT'] : '',
); 'APP_DOC_TITLE' => isset($_POST['TITLE'])? $_POST['TITLE'] : '',
'APP_DOC_FILENAME' => isset($_FILES['ATTACH_FILE']['name'])? $_FILES['ATTACH_FILE']['name'] : '',
'FOLDER_UID' => $folderId,
'APP_DOC_TAGS' => $fileTags
);
}
$oAppDocument->create($aFields); $oAppDocument->create($aFields);
}
$sAppUid = $oAppDocument->getAppUid(); $sAppUid = $oAppDocument->getAppUid();
$sAppDocUid = $oAppDocument->getAppDocUid(); $sAppDocUid = $oAppDocument->getAppDocUid();
$iDocVersion = $oAppDocument->getDocVersion(); $iDocVersion = $oAppDocument->getDocVersion();
$info = pathinfo($oAppDocument->getAppDocFilename()); $info = pathinfo($oAppDocument->getAppDocFilename());
$ext = (isset($info['extension']) ? $info['extension'] : ''); $ext = isset($info['extension'])? $info['extension'] : '';
//save the file //Save the file
echo $sPathName = PATH_DOCUMENT . $sAppUid . PATH_SEP; echo $sPathName = PATH_DOCUMENT . $sAppUid . PATH_SEP;
echo $sFileName = $sAppDocUid . '_' . $iDocVersion . '.' . $ext; echo $sFileName = $sAppDocUid . '_' . $iDocVersion . '.' . $ext;
print G::uploadFile($_FILES['ATTACH_FILE']['tmp_name'], $sPathName, $sFileName); print G::uploadFile($_FILES['ATTACH_FILE']['tmp_name'], $sPathName, $sFileName);
print("* The file {$_FILES['ATTACH_FILE']['name']} was uploaded successfully in case {$sAppUid} as input document..\n"); print("* The file {$_FILES['ATTACH_FILE']['name']} was uploaded successfully in case {$sAppUid} as input document..\n");
//Plugin Hook PM_UPLOAD_DOCUMENT for upload document //Get current Application Fields
$oPluginRegistry = & PMPluginRegistry::getSingleton(); $application = new Application();
if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT) && class_exists('uploadDocumentData')) { $appFields = $application->Load($_POST['APPLICATION']);
$oData['APP_UID'] = $_POST['APPLICATION']; $appFields = unserialize($appFields['APP_DATA']);
$documentData = new uploadDocumentData($_POST['APPLICATION'], $_POST['USR_UID'], $sPathName . $sFileName, $aFields['APP_DOC_FILENAME'], $sAppDocUid);
$oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData); $_SESSION['APPLICATION'] = $appFields['APPLICATION'];
unlink($sPathName . $sFileName); $_SESSION['PROCESS'] = $appFields['PROCESS'];
} $_SESSION['TASK'] = $appFields['TASK'];
/*end plugin*/ $_SESSION['INDEX'] = $appFields['INDEX'];
} catch ( Exception $e) { $_SESSION['USER_LOGGED'] = $appFields['USER_LOGGED']; //$_POST['USR_UID']
print( $e->getMessage() ); //$_SESSION['USR_USERNAME'] = $appFields['USR_USERNAME'];
} //$_SESSION['STEP_POSITION'] = 0;
//Plugin Hook PM_UPLOAD_DOCUMENT for upload document
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT) && class_exists("uploadDocumentData")) {
$triggerDetail = $oPluginRegistry->getTriggerInfo(PM_UPLOAD_DOCUMENT);
$documentData = new uploadDocumentData($_POST["APPLICATION"], $_POST["USR_UID"], $sPathName . $sFileName, $aFields["APP_DOC_FILENAME"], $sAppDocUid, $iDocVersion);
$uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
if ($uploadReturn) {
$aFields["APP_DOC_PLUGIN"] = $triggerDetail->sNamespace;
if (!isset($aFields["APP_DOC_UID"])) {
$aFields["APP_DOC_UID"] = $sAppDocUid;
}
if (!isset($aFields["DOC_VERSION"])) {
$aFields["DOC_VERSION"] = $iDocVersion;
}
$oAppDocument->update($aFields);
unlink($sPathName . $sFileName);
}
}
//End plugin
}
catch (Exception $e) {
print($e->getMessage());
}
} }

20
workflow/engine/templates/processes/webentryPost.tpl
View File

@@ -27,12 +27,24 @@
ws_open (); ws_open ();
$result = ws_newCase ( '{processUid}', '{taskUid}', convertFormToWSObjects($_POST['form']) ); $result = ws_newCase ( '{processUid}', '{taskUid}', convertFormToWSObjects($_POST['form']) );
if( $result->status_code == 0 ) { if ($result->status_code == 0) {
$caseId = $result->caseId; $caseId = $result->caseId;
$caseNr = $result->caseNumber; $caseNr = $result->caseNumber;
{USR_VAR}
#save files {USR_VAR}
if ($USR_UID == -1) {
G::LoadClass("sessions");
global $sessionId;
$sessions = new Sessions();
$session = $sessions->getSessionUser($sessionId);
$USR_UID = $session["USR_UID"];
}
//Save files
if ( isset($_FILES['form']) ) { if ( isset($_FILES['form']) ) {
foreach ($_FILES['form']['name'] as $sFieldName => $vValue) { foreach ($_FILES['form']['name'] as $sFieldName => $vValue) {
if ( $_FILES['form']['error'][$sFieldName] == 0 ){ if ( $_FILES['form']['error'][$sFieldName] == 0 ){