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

Merged in victorsl/processmaker/HOR-433-3018-B (pull request #3852)

Browse Source 
HOR-433
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-23 10:16:02 -04:00
parent 15b1e204fc 06963d81f2
commit 5a04f30eaf
8 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/cases/casesConsolidatedListExtJs.php
View File

@@ -133,7 +133,7 @@ while ($rsSql->next()) {
}
if (count($arrayTabItem) > 0) {
$urlProxy = '/api/1.0/' . SYS_SYS . '/consolidated/';
$urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
$clientId = 'x-pm-local-client';
$client = getClientCredentials($clientId);
$authCode = getAuthorizationCode($client);
@@ -178,7 +178,7 @@ if (count($arrayTabItem) > 0) {
$headPublisher->assign("FORMATS", $conf->getFormats());
$headPublisher->assign("urlProxy", $urlProxy);
$headPublisher->assign('credentials', $clientToken );
$ieVersion = null;
if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
$ieVersion = intval($arrayMatch[1]);

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

@@ -83,7 +83,7 @@ if ($oServerConf->isRtl( SYS_LANG )) {
$urlProxy = 'casesMenuLoader?action=getAllCounters&r=';
/*----------------------------------********---------------------------------*/
$urlProxy = '/api/1.0/' . SYS_SYS . '/system/counters-lists?r=';
$urlProxy = System::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/system/counters-lists?r=';
$clientId = 'x-pm-local-client';
$client = getClientCredentials($clientId);
$authCode = getAuthorizationCode($client);