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

Merged in feature/HOR-3226 (pull request #5713)

Browse Source 
Feature/HOR-3226

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
David Callizaya
2017-06-03 23:35:31 +00:00
committed by Julio Cesar Laura Avendaño
parent 801de49881 dd919be30d
commit 8cfc00398b
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/map/WebEntryMapBuilder.php
View File

@@ -95,7 +95,7 @@ class WebEntryMapBuilder
$tMap->addColumn('WE_AUTHENTICATION', 'WeAuthentication', 'string', CreoleTypes::VARCHAR, true, 14); $tMap->addColumn('WE_AUTHENTICATION', 'WeAuthentication', 'string', CreoleTypes::VARCHAR, true, 14);
$tMap->addColumn('WE_HIDE_INFORMATION_BAR', 'WeHideInformationBar', 'boolean', CreoleTypes::BOOLEAN, false, null); $tMap->addColumn('WE_HIDE_INFORMATION_BAR', 'WeHideInformationBar', 'string', CreoleTypes::CHAR, false, 1);
$tMap->addColumn('WE_CALLBACK', 'WeCallback', 'string', CreoleTypes::VARCHAR, true, 13); $tMap->addColumn('WE_CALLBACK', 'WeCallback', 'string', CreoleTypes::VARCHAR, true, 13);

18
workflow/engine/classes/model/om/BaseWebEntry.php
View File

@@ -119,9 +119,9 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
/** /**
* The value for the we_hide_information_bar field. * The value for the we_hide_information_bar field.
* @var boolean * @var string
*/ */
protected $we_hide_information_bar = false; protected $we_hide_information_bar = '0';
/** /**
* The value for the we_callback field. * The value for the we_callback field.
@@ -383,7 +383,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
/** /**
* Get the [we_hide_information_bar] column value. * Get the [we_hide_information_bar] column value.
* *
* @return boolean * @return string
*/ */
public function getWeHideInformationBar() public function getWeHideInformationBar()
{ {
@@ -804,13 +804,19 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
/** /**
* Set the value of [we_hide_information_bar] column. * Set the value of [we_hide_information_bar] column.
* *
* @param boolean $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setWeHideInformationBar($v) public function setWeHideInformationBar($v)
{ {
if ($this->we_hide_information_bar !== $v || $v === false) { // Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->we_hide_information_bar !== $v || $v === '0') {
$this->we_hide_information_bar = $v; $this->we_hide_information_bar = $v;
$this->modifiedColumns[] = WebEntryPeer::WE_HIDE_INFORMATION_BAR; $this->modifiedColumns[] = WebEntryPeer::WE_HIDE_INFORMATION_BAR;
} }
@@ -996,7 +1002,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
$this->we_authentication = $rs->getString($startcol + 14); $this->we_authentication = $rs->getString($startcol + 14);
$this->we_hide_information_bar = $rs->getBoolean($startcol + 15); $this->we_hide_information_bar = $rs->getString($startcol + 15);
$this->we_callback = $rs->getString($startcol + 16); $this->we_callback = $rs->getString($startcol + 16);

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

@@ -3346,7 +3346,7 @@
<column name="WE_TYPE" type="VARCHAR" size="8" required="true" default="SINGLE"/> <column name="WE_TYPE" type="VARCHAR" size="8" required="true" default="SINGLE"/>
<column name="WE_CUSTOM_TITLE" type="LONGVARCHAR" /> <column name="WE_CUSTOM_TITLE" type="LONGVARCHAR" />
<column name="WE_AUTHENTICATION" type="VARCHAR" size="14" required="true" default="ANONYMOUS"/> <column name="WE_AUTHENTICATION" type="VARCHAR" size="14" required="true" default="ANONYMOUS"/>
<column name="WE_HIDE_INFORMATION_BAR" type="BOOLEAN" default="0"/> <column name="WE_HIDE_INFORMATION_BAR" type="CHAR" size="1" default="0"/>
<column name="WE_CALLBACK" type="VARCHAR" size="13" required="true" default="PROCESSMAKER"/> <column name="WE_CALLBACK" type="VARCHAR" size="13" required="true" default="PROCESSMAKER"/>
<column name="WE_CALLBACK_URL" type="LONGVARCHAR" /> <column name="WE_CALLBACK_URL" type="LONGVARCHAR" />
<column name="WE_LINK_GENERATION" type="VARCHAR" size="8" required="true" default="DEFAULT" /> <column name="WE_LINK_GENERATION" type="VARCHAR" size="8" required="true" default="DEFAULT" />

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

@@ -1664,7 +1664,7 @@ CREATE TABLE `WEB_ENTRY`
`WE_TYPE` VARCHAR(8) default 'SINGLE' NOT NULL, `WE_TYPE` VARCHAR(8) default 'SINGLE' NOT NULL,
`WE_CUSTOM_TITLE` MEDIUMTEXT, `WE_CUSTOM_TITLE` MEDIUMTEXT,
`WE_AUTHENTICATION` VARCHAR(14) default 'ANONYMOUS' NOT NULL, `WE_AUTHENTICATION` VARCHAR(14) default 'ANONYMOUS' NOT NULL,
`WE_HIDE_INFORMATION_BAR` INTEGER default 0, `WE_HIDE_INFORMATION_BAR` CHAR(1) default '0',
`WE_CALLBACK` VARCHAR(13) default 'PROCESSMAKER' NOT NULL, `WE_CALLBACK` VARCHAR(13) default 'PROCESSMAKER' NOT NULL,
`WE_CALLBACK_URL` MEDIUMTEXT, `WE_CALLBACK_URL` MEDIUMTEXT,
`WE_LINK_GENERATION` VARCHAR(8) default 'DEFAULT' NOT NULL, `WE_LINK_GENERATION` VARCHAR(8) default 'DEFAULT' NOT NULL,