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

Merged in release/3.4.0 (pull request #7083)

Browse Source 
Release/3.4.0

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-09-25 14:12:20 +00:00
committed by Julio Cesar Laura Avendaño
parent a497b83d2f d4fb25d676
commit b7d108cfc7
4 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/AddParametersTrait.php
View File

@@ -35,7 +35,7 @@ trait AddParametersTrait
if (!empty($workspace)) { if (!empty($workspace)) {
$webApplication = new WebApplication(); $webApplication = new WebApplication();
$webApplication->setRootDir($this->option('processmakerPath')); $webApplication->setRootDir($this->option('processmakerPath'));
$webApplication->loadEnvironment($workspace); $webApplication->loadEnvironment($workspace, false);
} }
parent::handle(); parent::handle();
} }

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

@@ -429,16 +429,19 @@ class WebApplication
} }
/** /**
* Define constants, setup configuration and initialize Laravel * Define constants, setup configuration and initialize Laravel.
* The value of $executeSetupPlugin must always be true for a web environment.
* *
* @param string $workspace * @param string $workspace
* @param boolean $executeSetupPlugin
* @return bool * @return bool
* @throws Exception * @throws Exception
* *
* @see run() * @see run()
* @see workflow/engine/bin/cli.php * @see workflow/engine/bin/cli.php
* @see \App\Console\Commands\AddParametersTrait
*/ */
public function loadEnvironment($workspace = "") public function loadEnvironment($workspace = "", $executeSetupPlugin = true)
{ {
define("PATH_SEP", DIRECTORY_SEPARATOR); define("PATH_SEP", DIRECTORY_SEPARATOR);
@@ -624,7 +627,9 @@ class WebApplication
// Initialization functions plugins // Initialization functions plugins
$oPluginRegistry->init(); $oPluginRegistry->init();
//get and setup enabled plugins //get and setup enabled plugins
if ($executeSetupPlugin === true) {
$oPluginRegistry->setupPlugins(); $oPluginRegistry->setupPlugins();
}
return true; return true;
} }

3
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php
View File

@@ -118,7 +118,8 @@ trait SuggestTrait
} }
} }
if ($optionsLimit >= 0) { // Define if we need to add a limit in the query
if ($optionsLimit > 0) {
$this->addSuggestLimit($json, $select, $limit, $where); $this->addSuggestLimit($json, $select, $limit, $where);
} else { } else {
$this->addSuggestWhere($json, $parsed, $select, $where, $having); $this->addSuggestWhere($json, $parsed, $select, $where, $having);