fernando/luos
1
0
Fork 0
Code Releases Activity

PM-2288 "DesignerBPMN>CaseTracker: No se puede..." SOLVED

Browse Source 
> Code Isuue:
  DesignerBPMN>CaseTracker: No se puede visualizar el estado que tiene el caso creado
> Solution:
  Se completa a la opcion "Where is My Case?" del case tracker para el seguimiento del caso.
This commit is contained in:
Luis Fernando Saisa Lopez
2015-05-06 16:28:05 -04:00
parent 464eb9a7ff
commit 0c523ed296
3 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/designer.php
View File

@@ -128,6 +128,11 @@ class Designer extends Controller
\ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']); \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']);
$oauthServer = new \ProcessMaker\Services\OAuth2\Server(); $oauthServer = new \ProcessMaker\Services\OAuth2\Server();
if (!isset($_SESSION["USER_LOGGED"])) {
$_SESSION["USER_LOGGED"] = "00000000000000000000000000000001";
}
$userId = $_SESSION['USER_LOGGED']; $userId = $_SESSION['USER_LOGGED'];
$authorize = true; $authorize = true;
$_GET = array_merge($_GET, array( $_GET = array_merge($_GET, array(
@@ -151,4 +156,3 @@ class Designer extends Controller
return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS); return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
} }
} }

50
workflow/engine/templates/tracker/viewMap.php
View File

@@ -1,5 +1,45 @@
<!--<iframe name="casesFrame" id="casesFrame" src ="../designer?prj_uid=<?php echo $_SESSION['PROCESS']; ?>&prj_readonly=true&app_uid=<?php echo $_SESSION['APP_UID']; ?>" width="99%" height="768" frameborder="0"> <?php
<p>Your browser does not support iframes.</p> $url = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APP_UID"] . "&tracker_designer=1";
</iframe> ?>
-->
Not supported yet. <script type="text/javascript">
var winTracker;
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
var li1 = document.getElementById("MAP");
var a1 = li1.getElementsByTagName("a");
a1[0].href = "javascript:;";
a1[0].onclick = function () { winTracker = window.open("<?php echo $url; ?>", "winTracker"); return false; };
var li2 = document.getElementById("DYNADOC");
var a2= li2.getElementsByTagName("a");
a2[0].onclick = function ()
{
if (winTracker) {
winTracker.close();
}
};
var li3 = document.getElementById("HISTORY");
var a3 = li3.getElementsByTagName("a");
a3[0].onclick = function ()
{
if (winTracker) {
winTracker.close();
}
};
var li4 = document.getElementById("MESSAGES");
var a4 = li4.getElementsByTagName("a");
a4[0].onclick = function ()
{
if (winTracker) {
winTracker.close();
}
};
} else {
document.write("<iframe name=\"casesFrame\" id=\"casesFrame\" src=\"<?php echo $url; ?>\" width=\"99%\" height=\"768\" frameborder=\"0\">");
document.write("<p>Your browser does not support iframes.</p>");
document.write("</iframe>");
}
</script>

2
workflow/public_html/sysGeneric.php
View File

@@ -961,7 +961,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
} }
} }
if ($bRedirect) { if ($bRedirect && !isset($_GET["tracker_designer"])) {
if (substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs') { // verify if the current skin is a 'ux' variant if (substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs') { // verify if the current skin is a 'ux' variant
$loginUrl = 'main/login'; $loginUrl = 'main/login';
} else if (strpos( $_SERVER['REQUEST_URI'], '/home' ) !== false) { //verify is it is using the uxs skin for simplified interface } else if (strpos( $_SERVER['REQUEST_URI'], '/home' ) !== false) { //verify is it is using the uxs skin for simplified interface