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

This commit is contained in:
Dante
2015-11-25 14:26:33 -04:00
18 changed files with 260 additions and 178 deletions

View File

@@ -313,7 +313,11 @@ class Log_file extends Log
$myPid = PM_PID; $myPid = PM_PID;
//$request variable will have all the values in POST and GET //$request variable will have all the values in POST and GET
$request = ''; $request = '';
foreach( $_POST as $k => $v ) $request .= ($request!='' ? "\t" : '') . $k . '='.$v; foreach( $_POST as $k => $v ){
if(is_string($v)){
$request .= ($request!='' ? "\t" : '') . $k . '='.$v;
}
}
foreach( $_GET as $k => $v ) $request .= ($request!='' ? "\t" : '') . $k . '='.$v; foreach( $_GET as $k => $v ) $request .= ($request!='' ? "\t" : '') . $k . '='.$v;
//exact time with microseconds //exact time with microseconds

View File

@@ -729,7 +729,7 @@ class Derivation
$elementDestType $elementDestType
); );
if($elementDestUid == "-1"){ if($elementDestUid == "-1" || count($arrayElement) == 0){
$arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition); $arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
} }
@@ -1063,9 +1063,18 @@ class Derivation
$this->case->closeAllDelegations( $currentDelegation['APP_UID'] ); $this->case->closeAllDelegations( $currentDelegation['APP_UID'] );
$this->case->closeAllThreads( $currentDelegation['APP_UID'] ); $this->case->closeAllThreads( $currentDelegation['APP_UID'] );
//I think we need to change the APP_STATUS to completed, //I think we need to change the APP_STATUS to completed,
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 //BpmnEvent
$this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']); $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
}
break; break;
case TASK_FINISH_TASK: case TASK_FINISH_TASK:
$iAppThreadIndex = $appFields['DEL_THREAD']; $iAppThreadIndex = $appFields['DEL_THREAD'];
@@ -1204,9 +1213,16 @@ class Derivation
foreach ($arrayTaskNextDelNextDelegations as $key2 => $value2) { foreach ($arrayTaskNextDelNextDelegations as $key2 => $value2) {
$arrayTaskNextDelNextDel = $value2; $arrayTaskNextDelNextDel = $value2;
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"])) { if (!isset($arrayTaskNextDelNextDel["NEXT_TASK"]["USER_ASSIGNED"]["USR_UID"])) {
throw new Exception(G::LoadTranslation("ID_NO_USERS")); throw new Exception(G::LoadTranslation("ID_NO_USERS"));
} }
}
$rouPreType = ""; $rouPreType = "";
$rouPreTask = ""; $rouPreTask = "";

View File

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

View File

@@ -230,6 +230,10 @@ class ListInbox extends BaseListInbox
$data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters,'DEL_TASK_DUE_DATE'); $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 = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
@@ -346,6 +350,20 @@ class ListInbox extends BaseListInbox
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox'); //$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); self::create($data, $isSelfService);
} }

View File

@@ -179,6 +179,12 @@ if (count($arrayTabItem) > 0) {
$headPublisher->assign("urlProxy", $urlProxy); $headPublisher->assign("urlProxy", $urlProxy);
$headPublisher->assign('credentials', $clientToken ); $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("app/main", true);
$headPublisher->addExtJsScript("cases/casesListConsolidated", false); //Adding a JavaScript file .js $headPublisher->addExtJsScript("cases/casesListConsolidated", false); //Adding a JavaScript file .js
$headPublisher->addContent("cases/casesListConsolidated"); //Adding a HTML file .html $headPublisher->addContent("cases/casesListConsolidated"); //Adding a HTML file .html

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

View File

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

View File

@@ -388,7 +388,7 @@ class FilesManager
if ($path == '') { if ($path == '') {
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid'))); 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); $sPath = str_replace($sFile,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1); $sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath); $sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath);

View File

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

View File

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