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

Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail

Browse Source
This commit is contained in:
Dante
2015-11-25 14:26:33 -04:00
parent 824763602f 5ec3c483ae
commit 9691cfad4c
18 changed files with 260 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/class.derivation.php
View File

@@ -729,7 +729,7 @@ class Derivation
$elementDestType
);
if($elementDestUid == "-1"){
if($elementDestUid == "-1" || count($arrayElement) == 0){
$arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
}
@@ -1063,9 +1063,18 @@ class Derivation
$this->case->closeAllDelegations( $currentDelegation['APP_UID'] );
$this->case->closeAllThreads( $currentDelegation['APP_UID'] );
//I think we need to change the APP_STATUS to completed,
//BpmnEvent
$this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
if (isset($nextDel["TAS_UID_DUMMY"]) ) {
$taskDummy = TaskPeer::retrieveByPK($nextDel["TAS_UID_DUMMY"]);
if (preg_match("/^(?:END-MESSAGE-EVENT|END-EMAIL-EVENT)$/", $taskDummy->getTasType())) {
//Throw Events
$this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID_DUMMY"], $appFields, $flagFirstIteration, true);
} else {
$this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
}
} else {
//BpmnEvent
$this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
}
break;
case TASK_FINISH_TASK:
$iAppThreadIndex = $appFields['DEL_THREAD'];
@@ -1204,8 +1213,15 @@ class Derivation
foreach ($arrayTaskNextDelNextDelegations as $key2 => $value2) {
$arrayTaskNextDelNextDel = $value2;
if (!isset($arrayTaskNextDelNextDel["NEXT_TASK"]["USER_ASSIGNED"]["USR_UID"])) {
throw new Exception(G::LoadTranslation("ID_NO_USERS"));
if($arrayTaskNextDelNextDel["NEXT_TASK"]["TAS_ASSIGN_TYPE"] == 'MULTIPLE_INSTANCE'){
$aUserAssigned = true;
if(!isset($arrayTaskNextDelNextDel["NEXT_TASK"]["USER_ASSIGNED"]["0"]["USR_UID"])){
throw new Exception(G::LoadTranslation("ID_NO_USERS"));
}
} else {
if (!isset($arrayTaskNextDelNextDel["NEXT_TASK"]["USER_ASSIGNED"]["USR_UID"])) {
throw new Exception(G::LoadTranslation("ID_NO_USERS"));
}
}
$rouPreType = "";

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

@@ -431,7 +431,7 @@ function getDynaformsVars ($sProcessUID, $typeVars = 'all', $bIncMulSelFields =
if(is_array($dynaform) && sizeof($dynaform)) {
$items = $dynaform['items'][0]['items'];
foreach($items as $key => $val){
if($val[0]['type'] == 'grid'){
if(isset($val[0]['type']) && $val[0]['type'] == 'grid'){
if(sizeof($val[0]['columns'])) {
$columns = $val[0]['columns'];
foreach($columns as $column) {

18
workflow/engine/classes/model/ListInbox.php
View File

@@ -230,6 +230,10 @@ class ListInbox extends BaseListInbox
$data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters,'DEL_TASK_DUE_DATE');
}
if(isset($data['APP_INIT_DATE'])){
$data['DEL_INIT_DATE'] = $data['APP_INIT_DATE'];
}
$criteria = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
@@ -346,6 +350,20 @@ class ListInbox extends BaseListInbox
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
}
}
if ($data['USR_UID'] != '') {
$criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
}
self::create($data, $isSelfService);
}

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

@@ -178,6 +178,12 @@ 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]);
}
$oHeadPublisher->assign( 'ieVersion', $ieVersion );
$headPublisher->addExtJsScript("app/main", true);
$headPublisher->addExtJsScript("cases/casesListConsolidated", false); //Adding a JavaScript file .js

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

@@ -212,7 +212,12 @@ try {
$loc = $aNextStep['PAGE'];
}
//Triggers After
if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] )) {
$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]);
}
if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] ) && $ieVersion != 11) {
if ($_SESSION['TRIGGER_DEBUG']['ISSET'] == 1) {
$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
$oTemplatePower->prepare();
@@ -230,10 +235,7 @@ try {
}
//close tab only if IE11
$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]);
}
if($ieVersion == 11 && !isset($_SESSION['__OUTLOOK_CONNECTOR__'])) {
$script = "<script type='text/javascript'>
try {

9
workflow/engine/methods/cases/cases_Step.php
View File

@@ -207,7 +207,12 @@ if (isset( $_GET['breakpoint'] )) {
/**
* Here we throw the debug view
*/
if (isset( $_GET['breakpoint'] )) {
$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]);
}
if (isset( $_GET['breakpoint'] ) && $ieVersion != 11) {
$G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameLoader' );
$G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameBreaker' );
@@ -1305,7 +1310,7 @@ if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) {
G::RenderPage( 'publish', 'blank' );
if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
if ($_SESSION['TRIGGER_DEBUG']['ISSET'] && $ieVersion != 11) {
G::evalJScript( '
if (typeof showdebug != \'undefined\') {
showdebug();

BIN
workflow/engine/skinEngine/base/images/processmaker.logo.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
workflow/engine/skinEngine/base/images/updating/page_background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

BIN
workflow/engine/skinEngine/base/images/updating/page_background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

148
workflow/engine/skinEngine/base/updating.php
View File

@@ -69,9 +69,9 @@ body { background: #ffffff none repeat scroll 0 0 }
}
#main {
background: #ffffff url(images/updating/page_background.png) no-repeat scroll 0 0;
margin: 0 auto;
padding: 0;
background: #ECECEC;
height: 430px;
}
@@ -87,23 +87,23 @@ body { background: #ffffff none repeat scroll 0 0 }
#logo {
float: left;
padding-left: 42px;
padding-left: 0px;
}
#contact_details {
float: right;
color: #333333;
font-size: 13px;
font-style: normal;
line-height: 22px;
padding-right: 42px;
#contactDetails {
padding-top: 13px;
font: bold 15px moserrat !important;
color: #656464;
text-align: right;
float: right;
}
#contact_details a {
color: #333333;
font-size: 13px;
#contactDetails a {
font: bold 15px moserrat !important;
color: #656464;
text-decoration: none;
letter-spacing: 0.5px;
}
@@ -112,7 +112,6 @@ body { background: #ffffff none repeat scroll 0 0 }
#content {
padding: 10px 44px;
background-image: url(images/updating/underConstruction.png);
background-position: right top;
background-repeat: no-repeat;
}
@@ -120,28 +119,44 @@ body { background: #ffffff none repeat scroll 0 0 }
#content a {color: #ffffff; text-decoration: none;}
#content a:hover {color: #9CC9EC; text-decoration: underline;}
.text {
.backgroundOfText{
background: url(images/updating/page_background.jpg) no-repeat center center;
text-align: center;
margin-top: 40px;
padding-bottom: 40px;
border-bottom: 0px solid #cccccc;
color: #E5E5E5;
height: 345px;
}
.text h2 {
font-size: 30px;
color: #e5e5e5;
font-style: normal;
font-variant: normal;
font-weight: lighter;
letter-spacing: 2px;
.text1{
padding-top: 70px;
font: 40px moserrat;
color: #FFFFFF;
}
.details {
border-top: 0px solid #4f4f4f;
height: 100px;
text-align: center;
color: #ffffff;
.text2{
padding-top: 30px;
font: 30px moserrat;
color: #FFFFFF;
}
.urls{
padding-top: 20px;
text-align: center;
color: #368AC9;
}
.urls a{
font: bold 15px chivo;
color: #368AC9;
text-decoration: none;
}
.copyright{
margin-top: 6px;
font: bold 13px chivo;
color: #656464;
}
.copyright a{
color: #656464;
text-decoration: none;
}
a.prev {
@@ -156,60 +171,47 @@ a.next {
margin-right: 50px;
}
.copyright {
text-align: center;
margin-top: 10px;
font-size: 12px;
margin-bottom: 50px;
}
</style>
</head>
<body>
<div class="container">
<div id="header">
<div id="logo">
<a href="http://www.processmaker.com" target="_blank"><img src="images/processmaker.logo.jpg" alt="logo"/></a>
</div>
<div id="logo">
<a href="http://www.processmaker.com" target="_blank"><img src="images/processmaker.logo.jpg" alt="logo"/></a>
</div><!--end logo-->
<div id="contactDetails">
<p><a href="mailto:info@processmaker.com">info@processmaker.com</a></p>
<p>phone: (617) 340-3377</p>
</div>
<div id="contact_details">
<div style="clear:both"></div>
</div>
<p><a href="mailto:info@colosa.com">info@colosa.com</a></p>
<p>phone : +1-617-340-3377</p>
</div><!--end contact details-->
<div id="main">
<div class="backgroundOfText">
<div class="text1">
This application is being updated <br />
and it will be back shortly.
</div>
<div class="text2">Thank you for your patience</div>
</div>
</div><!--end header-->
<div style="clear:both"></div>
<div id="main">
<div id="content">
<div class="text">
<h2>This application is being updated.</h2>
<h2>It will be back online shortly.</h2>
<h2>Thank you for your patience.</h2>
</div><!--end text-->
<br/><br/><br/><br/>
<br/><br/><br/><br/>
<div class="details">
<br/><br/>
<a href="http://www.processmaker.com/privacy-statement">Privacy Statement</a> |
<a href="http://www.processmaker.com/security-statement">Security Statement</a> |
<a href="http://www.processmaker.com/terms-of-service">Terms of Service</a> |
<a href="http://www.processmaker.com/commercial-license">Commercial License</a> |
<a href="http://www.processmaker.com/contact-us">Contact Us</a> |
<!--<a href="#">Directory</a> |-->
<a href="http://feeds.feedburner.com/processmaker">RSS</a>
<br>
&copy; Copyright 2000 - <?php echo date('Y'); ?> Colosa, Inc. <a href="http://www.colosa.com">www.colosa.com</a>
</div><!--end details-->
</div><!--end content-->
</div><!--end main-->
<div class="urls">
<div>
<a href="http://www.processmaker.com/privacy-statement">Privacy Statement</a> -
<a href="http://www.processmaker.com/security-statement">Security Statement</a> -
<a href="http://www.processmaker.com/terms-of-service">Terms of Service</a> -
<a href="http://www.processmaker.com/commercial-license">Commercial License</a> -
<a href="http://www.processmaker.com/contact-us">Contact Us</a> -
<a href="http://feeds.feedburner.com/processmaker">RSS</a>
</div>
<div class="copyright">
Copyright 2000 - <?php echo date('Y'); ?> ProcessMaker Inc. &nbsp;&nbsp;<a href="http://www.processmaker.com">www.processmaker.com</a>
</div>
</div>
</div>
</div><!--end class container-->
</body>

BIN
workflow/engine/skinEngine/neoclassic/images/processmaker.logo.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
workflow/engine/skinEngine/neoclassic/images/updating/page_background.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

BIN
workflow/engine/skinEngine/neoclassic/images/updating/page_background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

150
workflow/engine/skinEngine/neoclassic/updating.php
View File

@@ -64,14 +64,14 @@ body {
body { background: #ffffff none repeat scroll 0 0 }
.container {
width: 885px;
width: 802px;
margin: 0 auto;
}
#main {
background: #ffffff url(images/updating/page_background.png) no-repeat scroll 0 0;
margin: 0 auto;
padding: 0;
background: #ECECEC;
height: 430px;
}
@@ -87,23 +87,23 @@ body { background: #ffffff none repeat scroll 0 0 }
#logo {
float: left;
padding-left: 42px;
padding-left: 0px;
}
#contact_details {
float: right;
color: #333333;
font-size: 13px;
font-style: normal;
line-height: 22px;
padding-right: 42px;
#contactDetails {
padding-top: 13px;
font: bold 15px moserrat !important;
color: #656464;
text-align: right;
float: right;
}
#contact_details a {
color: #333333;
font-size: 13px;
#contactDetails a {
font: bold 15px moserrat !important;
color: #656464;
text-decoration: none;
letter-spacing: 0.5px;
}
@@ -112,7 +112,6 @@ body { background: #ffffff none repeat scroll 0 0 }
#content {
padding: 10px 44px;
background-image: url(images/updating/underConstruction.png);
background-position: right top;
background-repeat: no-repeat;
}
@@ -120,28 +119,44 @@ body { background: #ffffff none repeat scroll 0 0 }
#content a {color: #ffffff; text-decoration: none;}
#content a:hover {color: #9CC9EC; text-decoration: underline;}
.text {
.backgroundOfText{
background: url(images/updating/page_background.jpg) no-repeat center center;
text-align: center;
margin-top: 40px;
padding-bottom: 40px;
border-bottom: 0px solid #cccccc;
color: #E5E5E5;
height: 345px;
}
.text h2 {
font-size: 30px;
color: #e5e5e5;
font-style: normal;
font-variant: normal;
font-weight: lighter;
letter-spacing: 2px;
.text1{
padding-top: 70px;
font: 40px moserrat;
color: #FFFFFF;
}
.details {
border-top: 0px solid #4f4f4f;
height: 100px;
text-align: center;
color: #ffffff;
.text2{
padding-top: 30px;
font: 30px moserrat;
color: #FFFFFF;
}
.urls{
padding-top: 20px;
text-align: center;
color: #368AC9;
}
.urls a{
font: bold 15px chivo;
color: #368AC9;
text-decoration: none;
}
.copyright{
margin-top: 6px;
font: bold 13px chivo;
color: #656464;
}
.copyright a{
color: #656464;
text-decoration: none;
}
a.prev {
@@ -156,60 +171,47 @@ a.next {
margin-right: 50px;
}
.copyright {
text-align: center;
margin-top: 10px;
font-size: 12px;
margin-bottom: 50px;
}
</style>
</head>
<body>
<div class="container">
<div id="header">
<div id="logo">
<a href="http://www.processmaker.com" target="_blank"><img src="images/processmaker.logo.jpg" alt="logo"/></a>
</div>
<div id="logo">
<a href="http://www.processmaker.com" target="_blank"><img src="images/processmaker.logo.jpg" alt="logo"/></a>
</div><!--end logo-->
<div id="contactDetails">
<p><a href="mailto:info@processmaker.com">info@processmaker.com</a></p>
<p>phone: (617) 340-3377</p>
</div>
<div id="contact_details">
<div style="clear:both"></div>
</div>
<p><a href="mailto:info@colosa.com">info@colosa.com</a></p>
<p>phone : +1-617-340-3377</p>
</div><!--end contact details-->
<div id="main">
<div class="backgroundOfText">
<div class="text1">
This application is being updated <br />
and it will be back shortly.
</div>
<div class="text2">Thank you for your patience</div>
</div>
</div><!--end header-->
<div style="clear:both"></div>
<div id="main">
<div id="content">
<div class="text">
<h2>This application is being updated.</h2>
<h2>It will be back online shortly.</h2>
<h2>Thank you for your patience.</h2>
</div><!--end text-->
<br/><br/><br/><br/>
<br/><br/><br/><br/>
<div class="details">
<br/><br/>
<a href="http://www.processmaker.com/privacy-statement">Privacy Statement</a> |
<a href="http://www.processmaker.com/security-statement">Security Statement</a> |
<a href="http://www.processmaker.com/terms-of-service">Terms of Service</a> |
<a href="http://www.processmaker.com/commercial-license">Commercial License</a> |
<a href="http://www.processmaker.com/contact-us">Contact Us</a> |
<!--<a href="#">Directory</a> |-->
<a href="http://feeds.feedburner.com/processmaker">RSS</a>
<br>
&copy; Copyright 2000 - <?php echo date('Y'); ?> Colosa, Inc. <a href="http://www.colosa.com">www.colosa.com</a>
</div><!--end details-->
</div><!--end content-->
</div><!--end main-->
<div class="urls">
<div>
<a href="http://www.processmaker.com/privacy-statement">Privacy Statement</a> -
<a href="http://www.processmaker.com/security-statement">Security Statement</a> -
<a href="http://www.processmaker.com/terms-of-service">Terms of Service</a> -
<a href="http://www.processmaker.com/commercial-license">Commercial License</a> -
<a href="http://www.processmaker.com/contact-us">Contact Us</a> -
<a href="http://feeds.feedburner.com/processmaker">RSS</a>
</div>
<div class="copyright">
Copyright 2000 - <?php echo date('Y'); ?> ProcessMaker Inc. &nbsp;&nbsp;<a href="http://www.processmaker.com">www.processmaker.com</a>
</div>
</div>
</div>
</div><!--end class container-->
</body>

2
workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -388,7 +388,7 @@ class FilesManager
if ($path == '') {
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid')));
}
$sFile = end(explode(DIRECTORY_SEPARATOR,$path));
$sFile = basename($path);
$sPath = str_replace($sFile,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath);

8
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -596,8 +596,12 @@ class User
$rbac->initRBAC();
if (isset($arrayData["USR_NEW_PASS"])) {
$arrayData["USR_PASSWORD"] = \Bootstrap::hashPassword($arrayData["USR_NEW_PASS"]);
if (isset($arrayData['USR_PASSWORD'])) {
$arrayData['USR_PASSWORD'] = \Bootstrap::hashPassword($arrayData['USR_PASSWORD']);
} else {
if (isset($arrayData['USR_NEW_PASS'])) {
$arrayData['USR_PASSWORD'] = \Bootstrap::hashPassword($arrayData['USR_NEW_PASS']);
}
}
$arrayData["USR_UID"] = $userUid;

49
workflow/engine/templates/cases/casesListConsolidated.js
View File

@@ -229,6 +229,7 @@ var htmlMessage;
//var rowLabels = [];
var smodel;
var newCaseNewTab;
function openCase(){
var rowModel = consolidatedGrid.getSelectionModel().getSelected();
@@ -236,15 +237,16 @@ function openCase(){
var appUid = rowModel.data.APP_UID;
var delIndex = rowModel.data.DEL_INDEX;
var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
Ext.Msg.show({
msg: _("ID_OPEN_CASE") + " " + caseTitle,
width:300,
wait:true,
waitConfig: {
interval:200
}
});
if(ieVersion != 11) {
Ext.Msg.show({
msg: _("ID_OPEN_CASE") + " " + caseTitle,
width:300,
wait:true,
waitConfig: {
interval:200
}
});
}
params = '';
switch(action){
case 'consolidated':
@@ -255,15 +257,24 @@ function openCase(){
break;
}
params += '&action=' + 'todo';
redirect(requestFile + '?' + params);
if(ieVersion == 11) {
if(newCaseNewTab) {
newCaseNewTab.close();
}
newCaseNewTab = window.open(requestFile + '?' + params);
} else {
redirect(requestFile + '?' + params);
}
} else {
msgBox(_("ID_INFORMATION"), _("ID_SELECT_ONE_AT_LEAST"));
}
}
function jumpToCase(appNumber){
Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
if(ieVersion != 11) {
Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
}
Ext.Ajax.request({
url: 'cases_Ajax',
success: function(response) {
@@ -272,7 +283,14 @@ function jumpToCase(appNumber){
params = 'APP_NUMBER=' + appNumber;
params += '&action=jump';
requestFile = '../cases/open';
redirect(requestFile + '?' + params);
if(ieVersion == 11) {
if(newCaseNewTab) {
newCaseNewTab.close();
}
newCaseNewTab = window.open(requestFile + '?' + params);
} else {
redirect(requestFile + '?' + params);
}
} else {
Ext.MessageBox.hide();
var message = new Array();
@@ -1342,3 +1360,8 @@ function linkRenderer(value)
return "<a href=\"" + value + "\" onclick=\"window.open('" + value + "', '_blank'); return false;\">" + value + "</a>";
}
Ext.EventManager.on(window, 'beforeunload', function () {
if(newCaseNewTab) {
newCaseNewTab.close();
}
});