fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
jonathan quispe
2015-04-30 15:24:36 -04:00
parent d2f997607d ec4d85dfbe
commit 27b35bc4d6
5 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
framework/src/Maveriks/WebApplication.php
View File

@@ -315,19 +315,6 @@ class WebApplication
$this->rest->setOverridingFormats('JsonFormat', 'UploadFormat');
$isPluginRequest = strpos($uri, '/plugin-') !== false ? true : false;
if ($isPluginRequest) {
$tmp = explode('/', $uri);
array_shift($tmp);
$tmp = array_shift($tmp);
$tmp = explode('-', $tmp);
$pluginName = $tmp[1];
$uri = str_replace('/plugin-'.$pluginName, '', $uri);
}
// Override $_SERVER['REQUEST_URI'] to Restler handles the modified url
// scan all api directory to find api classes
$classesList = Util\Common::rglob($apiDir . "/*");
@@ -356,24 +343,36 @@ class WebApplication
}
}
//if (! $isPluginRequest) { // if it is not a request for a plugin endpoint
//
// Register API Plugins classes
$isPluginRequest = strpos($uri, '/plugin-') !== false ? true : false;
if ($isPluginRequest) {
$tmp = explode('/', $uri);
array_shift($tmp);
$tmp = array_shift($tmp);
$tmp = explode('-', $tmp);
$pluginName = $tmp[1];
$uri = str_replace('plugin-'.$pluginName, strtolower($pluginName), $uri);
}
// hook to get rest api classes from plugins
if (class_exists('PMPluginRegistry') && file_exists(PATH_DATA_SITE . 'plugin.singleton')) {
$pluginRegistry = \PMPluginRegistry::loadSingleton(PATH_DATA_SITE . 'plugin.singleton');
$plugins = $pluginRegistry->getRegisteredRestServices();
if (! empty($plugins)) {
$pluginSourceDir = PATH_PLUGINS . $pluginName . DIRECTORY_SEPARATOR . 'src';
foreach ($plugins as $pluginName => $plugin) {
$pluginSourceDir = PATH_PLUGINS . $pluginName . DIRECTORY_SEPARATOR . 'src';
$loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->add($pluginSourceDir);
if (is_array($plugins) && array_key_exists($pluginName, $plugins)) {
foreach ($plugins[$pluginName] as $class) {
$loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->add($pluginSourceDir);
foreach ($plugin as $class) {
if (class_exists($class['namespace'])) {
$this->rest->addAPIClass($class['namespace']);
}
}
$this->rest->addAPIClass($class['namespace'], strtolower($pluginName));
}
}
}
}
}
@@ -597,3 +596,4 @@ class WebApplication
@unlink(PATH_DATA . 'sites' . DS . $workspace . DS . 'api-config.php');
}
}

7
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -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()

2
workflow/engine/classes/model/AppDelegation.php
View File

@@ -89,7 +89,7 @@ class AppDelegation extends BaseAppDelegation
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$delIndex = 1;
$delPreviusUsrUid = '';
$delPreviusUsrUid = $sUsrUid;
if ($rs->next()) {
$row = $rs->getRow();

2
workflow/engine/src/ProcessMaker/BusinessModel/Step/Trigger.php
View File

@@ -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'];

1
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -751,7 +751,6 @@ Ext.onReady( function() {
width : 200 ,
fieldLabel : _('ID_NAME') ,
name : 'name' ,
allowBlank : false,
msgTarget: 'side',
enableKeyEvents: true,
listeners: {