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

Merged in marcoAntonioNina/processmaker/GI-244-A (pull request #3464)

Browse Source 
GI-244-A
This commit is contained in:
Dante Loayza
2016-01-08 14:59:35 -04:00
parent f7ad60fe63 3f5cedd304
commit 8374469589
2 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -185,7 +185,7 @@ try {
// Set users drive - start // Set users drive - start
$licensedFeatures = &PMLicensedFeatures::getSingleton(); $licensedFeatures = &PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) { if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
G::LoadClass( "AppDocumentDrive" ); G::LoadClass( "AppDocumentDrive" );
$drive = new AppDocumentDrive(); $drive = new AppDocumentDrive();
if ($drive->getStatusDrive()) { if ($drive->getStatusDrive()) {

45
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1042,15 +1042,6 @@ class Cases
//$oPluginRegistry = & PMPluginRegistry::getSingleton(); //$oPluginRegistry = & PMPluginRegistry::getSingleton();
$listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData); $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
} }
/*----------------------------------********---------------------------------*/
$licensedFeatures = &\PMLicensedFeatures::getSingleton();
$statusPMGmail = false;
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
G::LoadClass( "AppDocumentDrive" );
$drive = new AppDocumentDrive();
$statusPMGmail = $drive->getStatusDrive();
}
/*----------------------------------********---------------------------------*/
$aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID); $aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
if (!is_array($aObjectPermissions)) { if (!is_array($aObjectPermissions)) {
$aObjectPermissions = array( $aObjectPermissions = array(
@@ -1167,12 +1158,6 @@ class Cases
} }
} }
} }
/*----------------------------------********---------------------------------*/
//change donwload link - drive
if ($statusPMGmail) {
$aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) { if ($lastVersion == $aRow['DOC_VERSION']) {
//Show only last version //Show only last version
$aInputDocuments[] = $aFields; $aInputDocuments[] = $aFields;
@@ -1244,12 +1229,7 @@ class Cases
} }
$aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_DOWNLOAD'); $aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_DOWNLOAD');
$aFields['DOWNLOAD_LINK'] = "cases/cases_ShowDocument?a=" . $aRow['APP_DOC_UID']; $aFields['DOWNLOAD_LINK'] = "cases/cases_ShowDocument?a=" . $aRow['APP_DOC_UID'];
/*----------------------------------********---------------------------------*/
//change donwload link - drive
if ($statusPMGmail) {
$aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) { if ($lastVersion == $aRow['DOC_VERSION']) {
//Show only last version //Show only last version
$aInputDocuments[] = $aFields; $aInputDocuments[] = $aFields;
@@ -1313,12 +1293,7 @@ class Cases
} }
} }
} }
/*----------------------------------********---------------------------------*/
//change donwload link - drive
if ($statusPMGmail) {
$aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) { if ($lastVersion == $aRow['DOC_VERSION']) {
//Show only last version //Show only last version
$aInputDocuments[] = $aFields; $aInputDocuments[] = $aFields;
@@ -1362,15 +1337,6 @@ class Cases
//$oPluginRegistry = & PMPluginRegistry::getSingleton(); //$oPluginRegistry = & PMPluginRegistry::getSingleton();
$listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData); $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
} }
/*----------------------------------********---------------------------------*/
$licensedFeatures = &\PMLicensedFeatures::getSingleton();
$statusPMGmail = false;
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
G::LoadClass( "AppDocumentDrive" );
$drive = new AppDocumentDrive();
$statusPMGmail = $drive->getStatusDrive();
}
/*----------------------------------********---------------------------------*/
$aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID); $aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
if (!is_array($aObjectPermissions)) { if (!is_array($aObjectPermissions)) {
$aObjectPermissions = array('DYNAFORMS' => array(-1),'INPUT_DOCUMENTS' => array(-1),'OUTPUT_DOCUMENTS' => array(-1)); $aObjectPermissions = array('DYNAFORMS' => array(-1),'INPUT_DOCUMENTS' => array(-1),'OUTPUT_DOCUMENTS' => array(-1));
@@ -1516,13 +1482,6 @@ class Cases
} catch (\Exception $oException) { } catch (\Exception $oException) {
$sUser = '(USER DELETED)'; $sUser = '(USER DELETED)';
} }
/*----------------------------------********---------------------------------*/
//change donwload link - drive
if ($statusPMGmail) {
$fileDoc = $drive->changeUrlDrive($aRow, 'OUTPUT_DOC');
$filePdf = $drive->changeUrlDrive($aRow, 'OUTPUT_PDF');
}
/*----------------------------------********---------------------------------*/
//if both documents were generated, we choose the pdf one, only if doc was //if both documents were generated, we choose the pdf one, only if doc was
//generate then choose the doc file. //generate then choose the doc file.
$firstDocLink = $filePdf; $firstDocLink = $filePdf;