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

solving conflicts

Browse Source
This commit is contained in:
marcelo.cuiza
2015-06-25 15:35:29 -04:00
parent e72277f964
commit 0fb6241bd9
10 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ class EmailEventMapBuilder
$tMap->addColumn('EMAIL_EVENT_SUBJECT', 'EmailEventSubject', 'string', CreoleTypes::VARCHAR, false, 150);
$tMap->addColumn('EMAIL_EVENT_BODY', 'EmailEventBody', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('PRF_UID', 'PrfUid', 'string', CreoleTypes::VARCHAR, false, 32);
} // doBuild()

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

@@ -159,7 +159,7 @@ class TaskMapBuilder
$tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15);
$tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|END-EMAIL-EVENT', 'Please enter a valid value for TAS_TYPE');
$tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TAS|END-EMAIL-EVENT', 'Please enter a valid value for TAS_TYPE');
$tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.');

38
workflow/engine/classes/model/om/BaseEmailEvent.php
View File

@@ -64,10 +64,10 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
protected $email_event_subject = '';
/**
* The value for the email_event_body field.
* The value for the prf_uid field.
* @var string
*/
protected $email_event_body;
protected $prf_uid = '';
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -150,14 +150,14 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
}
/**
* Get the [email_event_body] column value.
* Get the [prf_uid] column value.
*
* @return string
*/
public function getEmailEventBody()
public function getPrfUid()
{
return $this->email_event_body;
return $this->prf_uid;
}
/**
@@ -293,12 +293,12 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
} // setEmailEventSubject()
/**
* Set the value of [email_event_body] column.
* Set the value of [prf_uid] column.
*
* @param string $v new value
* @return void
*/
public function setEmailEventBody($v)
public function setPrfUid($v)
{
// Since the native PHP type for this column is string,
@@ -307,12 +307,12 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->email_event_body !== $v) {
$this->email_event_body = $v;
$this->modifiedColumns[] = EmailEventPeer::EMAIL_EVENT_BODY;
if ($this->prf_uid !== $v || $v === '') {
$this->prf_uid = $v;
$this->modifiedColumns[] = EmailEventPeer::PRF_UID;
}
} // setEmailEventBody()
} // setPrfUid()
/**
* Hydrates (populates) the object variables with values from the database resultset.
@@ -343,7 +343,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$this->email_event_subject = $rs->getString($startcol + 5);
$this->email_event_body = $rs->getString($startcol + 6);
$this->prf_uid = $rs->getString($startcol + 6);
$this->resetModified();
@@ -573,7 +573,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
return $this->getEmailEventSubject();
break;
case 6:
return $this->getEmailEventBody();
return $this->getPrfUid();
break;
default:
return null;
@@ -601,7 +601,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$keys[3] => $this->getEmailEventFrom(),
$keys[4] => $this->getEmailEventTo(),
$keys[5] => $this->getEmailEventSubject(),
$keys[6] => $this->getEmailEventBody(),
$keys[6] => $this->getPrfUid(),
);
return $result;
}
@@ -652,7 +652,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$this->setEmailEventSubject($value);
break;
case 6:
$this->setEmailEventBody($value);
$this->setPrfUid($value);
break;
} // switch()
}
@@ -702,7 +702,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
}
if (array_key_exists($keys[6], $arr)) {
$this->setEmailEventBody($arr[$keys[6]]);
$this->setPrfUid($arr[$keys[6]]);
}
}
@@ -740,8 +740,8 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$criteria->add(EmailEventPeer::EMAIL_EVENT_SUBJECT, $this->email_event_subject);
}
if ($this->isColumnModified(EmailEventPeer::EMAIL_EVENT_BODY)) {
$criteria->add(EmailEventPeer::EMAIL_EVENT_BODY, $this->email_event_body);
if ($this->isColumnModified(EmailEventPeer::PRF_UID)) {
$criteria->add(EmailEventPeer::PRF_UID, $this->prf_uid);
}
@@ -808,7 +808,7 @@ abstract class BaseEmailEvent extends BaseObject implements Persistent
$copyObj->setEmailEventSubject($this->email_event_subject);
$copyObj->setEmailEventBody($this->email_event_body);
$copyObj->setPrfUid($this->prf_uid);
$copyObj->setNew(true);

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

@@ -49,8 +49,8 @@ abstract class BaseEmailEventPeer
/** the column name for the EMAIL_EVENT_SUBJECT field */
const EMAIL_EVENT_SUBJECT = 'EMAIL_EVENT.EMAIL_EVENT_SUBJECT';
/** the column name for the EMAIL_EVENT_BODY field */
const EMAIL_EVENT_BODY = 'EMAIL_EVENT.EMAIL_EVENT_BODY';
/** the column name for the PRF_UID field */
const PRF_UID = 'EMAIL_EVENT.PRF_UID';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -63,9 +63,9 @@ abstract class BaseEmailEventPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('EmailEventUid', 'PrjUid', 'EvnUid', 'EmailEventFrom', 'EmailEventTo', 'EmailEventSubject', 'EmailEventBody', ),
BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID, EmailEventPeer::PRJ_UID, EmailEventPeer::EVN_UID, EmailEventPeer::EMAIL_EVENT_FROM, EmailEventPeer::EMAIL_EVENT_TO, EmailEventPeer::EMAIL_EVENT_SUBJECT, EmailEventPeer::EMAIL_EVENT_BODY, ),
BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID', 'PRJ_UID', 'EVN_UID', 'EMAIL_EVENT_FROM', 'EMAIL_EVENT_TO', 'EMAIL_EVENT_SUBJECT', 'EMAIL_EVENT_BODY', ),
BasePeer::TYPE_PHPNAME => array ('EmailEventUid', 'PrjUid', 'EvnUid', 'EmailEventFrom', 'EmailEventTo', 'EmailEventSubject', 'PrfUid', ),
BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID, EmailEventPeer::PRJ_UID, EmailEventPeer::EVN_UID, EmailEventPeer::EMAIL_EVENT_FROM, EmailEventPeer::EMAIL_EVENT_TO, EmailEventPeer::EMAIL_EVENT_SUBJECT, EmailEventPeer::PRF_UID, ),
BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID', 'PRJ_UID', 'EVN_UID', 'EMAIL_EVENT_FROM', 'EMAIL_EVENT_TO', 'EMAIL_EVENT_SUBJECT', 'PRF_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
);
@@ -76,9 +76,9 @@ abstract class BaseEmailEventPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('EmailEventUid' => 0, 'PrjUid' => 1, 'EvnUid' => 2, 'EmailEventFrom' => 3, 'EmailEventTo' => 4, 'EmailEventSubject' => 5, 'EmailEventBody' => 6, ),
BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID => 0, EmailEventPeer::PRJ_UID => 1, EmailEventPeer::EVN_UID => 2, EmailEventPeer::EMAIL_EVENT_FROM => 3, EmailEventPeer::EMAIL_EVENT_TO => 4, EmailEventPeer::EMAIL_EVENT_SUBJECT => 5, EmailEventPeer::EMAIL_EVENT_BODY => 6, ),
BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID' => 0, 'PRJ_UID' => 1, 'EVN_UID' => 2, 'EMAIL_EVENT_FROM' => 3, 'EMAIL_EVENT_TO' => 4, 'EMAIL_EVENT_SUBJECT' => 5, 'EMAIL_EVENT_BODY' => 6, ),
BasePeer::TYPE_PHPNAME => array ('EmailEventUid' => 0, 'PrjUid' => 1, 'EvnUid' => 2, 'EmailEventFrom' => 3, 'EmailEventTo' => 4, 'EmailEventSubject' => 5, 'PrfUid' => 6, ),
BasePeer::TYPE_COLNAME => array (EmailEventPeer::EMAIL_EVENT_UID => 0, EmailEventPeer::PRJ_UID => 1, EmailEventPeer::EVN_UID => 2, EmailEventPeer::EMAIL_EVENT_FROM => 3, EmailEventPeer::EMAIL_EVENT_TO => 4, EmailEventPeer::EMAIL_EVENT_SUBJECT => 5, EmailEventPeer::PRF_UID => 6, ),
BasePeer::TYPE_FIELDNAME => array ('EMAIL_EVENT_UID' => 0, 'PRJ_UID' => 1, 'EVN_UID' => 2, 'EMAIL_EVENT_FROM' => 3, 'EMAIL_EVENT_TO' => 4, 'EMAIL_EVENT_SUBJECT' => 5, 'PRF_UID' => 6, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
);
@@ -192,7 +192,7 @@ abstract class BaseEmailEventPeer
$criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_SUBJECT);
$criteria->addSelectColumn(EmailEventPeer::EMAIL_EVENT_BODY);
$criteria->addSelectColumn(EmailEventPeer::PRF_UID);
}