Merge branch 'master' of https://bitbucket.org/jonathanquispe/processmaker into pm2352
This commit is contained in:
@@ -1408,16 +1408,16 @@ class PMPluginRegistry
|
||||
|
||||
// Ensure that is registering only existent classes.
|
||||
if (class_exists($ns)) {
|
||||
$this->_restServices[strtolower($sNamespace)][] = array(
|
||||
$this->_restServices[$sNamespace][] = array(
|
||||
"filepath" => $classFile,
|
||||
"namespace" => $ns
|
||||
);
|
||||
|
||||
\Maveriks\WebApplication::purgeRestApiCache(basename(PATH_DATA_SITE));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
\Maveriks\WebApplication::purgeRestApiCache(basename(PATH_DATA_SITE));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1429,6 +1429,7 @@ class PMPluginRegistry
|
||||
public function unregisterRestService ($sNamespace)
|
||||
{
|
||||
unset($this->_restServices[$sNamespace]);
|
||||
\Maveriks\WebApplication::purgeRestApiCache(basename(PATH_DATA_SITE));
|
||||
}
|
||||
|
||||
public function getRegisteredRestServices()
|
||||
|
||||
@@ -89,7 +89,7 @@ class AppDelegation extends BaseAppDelegation
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
$delIndex = 1;
|
||||
$delPreviusUsrUid = '';
|
||||
$delPreviusUsrUid = $sUsrUid;
|
||||
if ($rs->next()) {
|
||||
$row = $rs->getRow();
|
||||
|
||||
|
||||
@@ -411,6 +411,8 @@ class Trigger
|
||||
}
|
||||
|
||||
$range = range($iniPos, $finPos);
|
||||
$stepChangeIds = array();
|
||||
$stepChangePos = array();
|
||||
foreach ($aStepTriggers as $dataStep) {
|
||||
if (($dataStep['st_type'] == $typeCompare) && (in_array($dataStep['st_position'], $range)) && ($dataStep['tri_uid'] != $triUid)) {
|
||||
$stepChangeIds[] = $dataStep['tri_uid'];
|
||||
|
||||
@@ -751,7 +751,6 @@ Ext.onReady( function() {
|
||||
width : 200 ,
|
||||
fieldLabel : _('ID_NAME') ,
|
||||
name : 'name' ,
|
||||
allowBlank : false,
|
||||
msgTarget: 'side',
|
||||
enableKeyEvents: true,
|
||||
listeners: {
|
||||
|
||||
Reference in New Issue
Block a user