fernando/luos
1
0
Fork 0
Code Releases Activity

Update from 3.2 and solve conflicts

Browse Source
This commit is contained in:
Paula Quispe
2017-03-01 10:51:38 -04:00
parent 01733281e9 73b9b8a6fe
commit 381bf03d1f
29 changed files with 377 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/classes/class.case.php
View File

@@ -6869,18 +6869,15 @@ class Cases
public function getCurrentDelegationCase($sApplicationUID = '')
{
$oSession = new DBSession(new DBConnection());
$oDataset = $oSession->Execute('
SELECT
DEL_INDEX
FROM
APP_DELEGATION
WHERE
APP_UID = "' . $sApplicationUID . '"
ORDER BY DEL_DELEGATE_DATE DESC
');
$aRow = $oDataset->Read();
return $aRow['DEL_INDEX'];
$criteria = new \Criteria('workflow');
$criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX);
$criteria->add(\AppDelegationPeer::APP_UID, $sApplicationUID, Criteria::EQUAL);
$criteria->add(\AppDelegationPeer::DEL_LAST_INDEX, 1, Criteria::EQUAL);
$dataSet = AppDelegationPeer::doSelectRS($criteria);
$dataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataSet->next();
$row = $dataSet->getRow();
return isset($row['DEL_INDEX']) ? $row['DEL_INDEX'] : 0;
}
public function clearCaseSessionData()

4
workflow/engine/classes/class.dashletProcessMakerCommunity.php
View File

@@ -103,7 +103,7 @@ class dashletProcessMakerCommunity implements DashletInterface
<div class=\"description\">
<strong>FORUM - </strong><a href=\"http://forum.processmaker.com/\" target=\"_blank\" title=\"http://forum.processmaker.com\">http://forum.processmaker.com</a>
<br />
Discuss Processker issues, interact with the PMOS community, and get support from fellow developers and community members in the ProcessMaker Forum.
Discuss ProcessMaker issues, interact with the PMOS community, and get support from fellow developers and community members in the ProcessMaker Forum.
</div>
<div class=\"clearf\"></div>
@@ -139,4 +139,4 @@ class dashletProcessMakerCommunity implements DashletInterface
echo $html;
}
}
}

2
workflow/engine/classes/class.enterpriseUtils.php
View File

@@ -113,7 +113,7 @@ class EnterpriseUtils
public static function getUrlServerName()
{
$s = (empty($_SERVER["HTTPS"]))? null : (($_SERVER["HTTPS"] == "on")? "s" : null);
$s = (G::is_https() ? "s" : null);
$p = strtolower($_SERVER["SERVER_PROTOCOL"]);
$protocol = substr($p, 0, strpos($p, "/")) . $s;

19
workflow/engine/classes/class.pmFunctions.php
View File

@@ -3960,22 +3960,3 @@ function PMFSendMessageToGroup(
//Return
return 1;
}
/**
* @method
*
* Direct case link mobile
*
* @name PMFCaseLinkMobile
* @label PMF Direct case link mobile
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFCaseLinkMobile.28.29
*
* @param string(32) | $applicationUid | ID of the case | The unique ID of the case
* @param int | $delIndex = 0 | Delegation index of the case | Optional parameter. The delegation index of a case
* @return string | $url | Direct case link to Mobile | Returns the direct case link to Mobile, FALSE otherwise
*/
function PMFCaseLinkMobile($applicationUid, $delIndex = 0)
{
//Return
return G::caseLinkMobile($applicationUid, $delIndex);
}

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

@@ -1154,7 +1154,7 @@ class OutputDocument extends BaseOutputDocument
copy($sPath . $sFilename . '.html', PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
try {
$status = $pipeline->process(((isset($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media);
$status = $pipeline->process((G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media);
copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf');
unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf');
unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');