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

change default value in type boolean

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-07 15:56:23 -04:00
parent 75b1f1a520
commit 14e81863d2
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/model/om/BasePluginsRegistry.php
View File

@@ -67,13 +67,13 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
* The value for the plugin_file field.
* @var string
*/
protected $plugin_file = '';
protected $plugin_file;
/**
* The value for the plugin_folder field.
* @var string
*/
protected $plugin_folder = '';
protected $plugin_folder;
/**
* The value for the plugin_setup_page field.
@@ -103,13 +103,13 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
* The value for the plugin_enable field.
* @var boolean
*/
protected $plugin_enable = true;
protected $plugin_enable = false;
/**
* The value for the plugin_private field.
* @var boolean
*/
protected $plugin_private = true;
protected $plugin_private = false;
/**
* The value for the plugin_menus field.
@@ -596,7 +596,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->plugin_file !== $v || $v === '') {
if ($this->plugin_file !== $v) {
$this->plugin_file = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_FILE;
}
@@ -618,7 +618,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->plugin_folder !== $v || $v === '') {
if ($this->plugin_folder !== $v) {
$this->plugin_folder = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_FOLDER;
}
@@ -722,7 +722,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
public function setPluginEnable($v)
{
if ($this->plugin_enable !== $v || $v === true) {
if ($this->plugin_enable !== $v || $v === false) {
$this->plugin_enable = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_ENABLE;
}
@@ -738,7 +738,7 @@ abstract class BasePluginsRegistry extends BaseObject implements Persistent
public function setPluginPrivate($v)
{
if ($this->plugin_private !== $v || $v === true) {
if ($this->plugin_private !== $v || $v === false) {
$this->plugin_private = $v;
$this->modifiedColumns[] = PluginsRegistryPeer::PLUGIN_PRIVATE;
}

8
workflow/engine/config/schema.xml
View File

@@ -5623,14 +5623,14 @@
<column name="PLUGIN_DESCRIPTION" type="VARCHAR" size="200" default=""/>
<column name="PLUGIN_CLASS_NAME" type="VARCHAR" size="100" required="true"/>
<column name="PLUGIN_FRIENDLY_NAME" type="VARCHAR" size="150" default=""/>
<column name="PLUGIN_FILE" type="VARCHAR" size="250" required="true" default=""/>
<column name="PLUGIN_FOLDER" type="VARCHAR" size="100" required="true" default=""/>
<column name="PLUGIN_FILE" type="VARCHAR" size="250" required="true"/>
<column name="PLUGIN_FOLDER" type="VARCHAR" size="100" required="true"/>
<column name="PLUGIN_SETUP_PAGE" type="VARCHAR" size="100" default=""/>
<column name="PLUGIN_COMPANY_LOGO" type="VARCHAR" size="100" default=""/>
<column name="PLUGIN_WORKSPACES" type="VARCHAR" size="100" default=""/>
<column name="PLUGIN_VERSION" type="VARCHAR" size="50" default=""/>
<column name="PLUGIN_ENABLE" type="BOOLEAN" default="false"/>
<column name="PLUGIN_PRIVATE" type="BOOLEAN" default="false"/>
<column name="PLUGIN_ENABLE" type="BOOLEAN" default="0"/>
<column name="PLUGIN_PRIVATE" type="BOOLEAN" default="0"/>
<!--PluginProperties-->
<column name="PLUGIN_MENUS" type="LONGVARCHAR"/>
<column name="PLUGIN_FOLDERS" type="LONGVARCHAR"/>

4
workflow/engine/data/mysql/schema.sql
View File

@@ -3148,8 +3148,8 @@ CREATE TABLE `PLUGINS_REGISTRY`
`PLUGIN_DESCRIPTION` VARCHAR(200) default '',
`PLUGIN_CLASS_NAME` VARCHAR(100) NOT NULL,
`PLUGIN_FRIENDLY_NAME` VARCHAR(150) default '',
`PLUGIN_FILE` VARCHAR(250) default '' NOT NULL,
`PLUGIN_FOLDER` VARCHAR(100) default '' NOT NULL,
`PLUGIN_FILE` VARCHAR(250) NOT NULL,
`PLUGIN_FOLDER` VARCHAR(100) NOT NULL,
`PLUGIN_SETUP_PAGE` VARCHAR(100) default '',
`PLUGIN_COMPANY_LOGO` VARCHAR(100) default '',
`PLUGIN_WORKSPACES` VARCHAR(100) default '',

5
workflow/engine/src/ProcessMaker/Plugins/Adapters/PluginAdapter.php
View File

@@ -178,8 +178,7 @@ class PluginAdapter
foreach ($PMPluginRegistry as $propertyName => $propertyValue) {
foreach ($propertyValue as $key => $plugin) {
if (is_array($plugin) &&
((array_key_exists('Namespace', $plugin) && $plugin['Namespace'] == $Namespace) ||
(!is_int($key) && $key == $Namespace))
(array_key_exists('Namespace', $plugin) && $plugin['Namespace'] == $Namespace)
) {
$newStructurePlugin[$propertyName][] = $plugin;
} elseif (is_array($plugin) &&
@@ -187,6 +186,8 @@ class PluginAdapter
$plugin['pluginName'] == $Namespace
) {
$newStructurePlugin[$propertyName][] = $plugin;
} elseif (!is_int($key) && $key == $Namespace) {
$newStructurePlugin[$propertyName][$key] = $plugin;
} elseif (is_string($plugin) && $plugin == $Namespace) {
$newStructurePlugin[$propertyName][] = $plugin;
}