fernando/luos
1
0
Fork 0
Code Releases Activity

PM-1146 "Los pools y sus elementos contenidos no se graban al grabar el proyecto." SOLVED

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-12-20 16:45:26 -04:00
parent 76096583c3
commit 6202e95616
8 changed files with 7 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ class BpmnLaneMapBuilder
$tMap->addForeignKey('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, 'BPMN_PROJECT', 'PRJ_UID', true, 32);
$tMap->addForeignKey('LNS_UID', 'LnsUid', 'string', CreoleTypes::VARCHAR, 'BPMN_LANESET', 'LNS_UID', true, 32);
$tMap->addColumn('LNS_UID', 'LnsUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('LAN_NAME', 'LanName', 'string', CreoleTypes::VARCHAR, false, 255);

73
workflow/engine/classes/model/om/BaseBpmnLane.php
View File

@@ -68,11 +68,6 @@ abstract class BaseBpmnLane extends BaseObject implements Persistent
*/
protected $aBpmnProject;
/**
* @var BpmnLaneset
*/
protected $aBpmnLaneset;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -221,10 +216,6 @@ abstract class BaseBpmnLane extends BaseObject implements Persistent
$this->modifiedColumns[] = BpmnLanePeer::LNS_UID;
}
if ($this->aBpmnLaneset !== null && $this->aBpmnLaneset->getLnsUid() !== $v) {
$this->aBpmnLaneset = null;
}
} // setLnsUid()
/**
@@ -425,13 +416,6 @@ abstract class BaseBpmnLane extends BaseObject implements Persistent
$this->setBpmnProject($this->aBpmnProject);
}
if ($this->aBpmnLaneset !== null) {
if ($this->aBpmnLaneset->isModified()) {
$affectedRows += $this->aBpmnLaneset->save($con);
}
$this->setBpmnLaneset($this->aBpmnLaneset);
}
// If this object has been modified, then save it to the database.
if ($this->isModified()) {
@@ -525,12 +509,6 @@ abstract class BaseBpmnLane extends BaseObject implements Persistent
}
}
if ($this->aBpmnLaneset !== null) {
if (!$this->aBpmnLaneset->validate($columns)) {
$failureMap = array_merge($failureMap, $this->aBpmnLaneset->getValidationFailures());
}
}
if (($retval = BpmnLanePeer::doValidate($this, $columns)) !== true) {
$failureMap = array_merge($failureMap, $retval);
@@ -903,56 +881,5 @@ abstract class BaseBpmnLane extends BaseObject implements Persistent
}
return $this->aBpmnProject;
}
/**
* Declares an association between this object and a BpmnLaneset object.
*
* @param BpmnLaneset $v
* @return void
* @throws PropelException
*/
public function setBpmnLaneset($v)
{
if ($v === null) {
$this->setLnsUid(NULL);
} else {
$this->setLnsUid($v->getLnsUid());
}
$this->aBpmnLaneset = $v;
}
/**
* Get the associated BpmnLaneset object
*
* @param Connection Optional Connection object.
* @return BpmnLaneset The associated BpmnLaneset object.
* @throws PropelException
*/
public function getBpmnLaneset($con = null)
{
// include the related Peer class
include_once 'classes/model/om/BaseBpmnLanesetPeer.php';
if ($this->aBpmnLaneset === null && (($this->lns_uid !== "" && $this->lns_uid !== null))) {
$this->aBpmnLaneset = BpmnLanesetPeer::retrieveByPK($this->lns_uid, $con);
/* The following can be used instead of the line above to
guarantee the related object contains a reference
to this object, but this level of coupling
may be undesirable in many circumstances.
As it can lead to a db query with many results that may
never be used.
$obj = BpmnLanesetPeer::retrieveByPK($this->lns_uid, $con);
$obj->addBpmnLanesets($this);
*/
}
return $this->aBpmnLaneset;
}
}

342
workflow/engine/classes/model/om/BaseBpmnLanePeer.php
View File

File diff suppressed because it is too large Load Diff

196
workflow/engine/classes/model/om/BaseBpmnLaneset.php
View File

@@ -79,18 +79,6 @@ abstract class BaseBpmnLaneset extends BaseObject implements Persistent
*/
protected $aBpmnProcess;
/**
* Collection to store aggregation of collBpmnLanes.
* @var array
*/
protected $collBpmnLanes;
/**
* The criteria used to select the current contents of collBpmnLanes.
* @var Criteria
*/
protected $lastBpmnLaneCriteria = null;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -501,14 +489,6 @@ abstract class BaseBpmnLaneset extends BaseObject implements Persistent
$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
}
if ($this->collBpmnLanes !== null) {
foreach($this->collBpmnLanes as $referrerFK) {
if (!$referrerFK->isDeleted()) {
$affectedRows += $referrerFK->save($con);
}
}
}
$this->alreadyInSave = false;
}
return $affectedRows;
@@ -598,14 +578,6 @@ abstract class BaseBpmnLaneset extends BaseObject implements Persistent
}
if ($this->collBpmnLanes !== null) {
foreach($this->collBpmnLanes as $referrerFK) {
if (!$referrerFK->validate($columns)) {
$failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
}
}
}
$this->alreadyInValidation = false;
}
@@ -895,18 +867,6 @@ abstract class BaseBpmnLaneset extends BaseObject implements Persistent
$copyObj->setLnsState($this->lns_state);
if ($deepCopy) {
// important: temporarily setNew(false) because this affects the behavior of
// the getter/setter methods for fkey referrer objects.
$copyObj->setNew(false);
foreach($this->getBpmnLanes() as $relObj) {
$copyObj->addBpmnLane($relObj->copy($deepCopy));
}
} // if ($deepCopy)
$copyObj->setNew(true);
$copyObj->setLnsUid(''); // this is a pkey column, so set to default value
@@ -1052,161 +1012,5 @@ abstract class BaseBpmnLaneset extends BaseObject implements Persistent
}
return $this->aBpmnProcess;
}
/**
* Temporary storage of collBpmnLanes to save a possible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
* @return void
*/
public function initBpmnLanes()
{
if ($this->collBpmnLanes === null) {
$this->collBpmnLanes = array();
}
}
/**
* If this collection has already been initialized with
* an identical criteria, it returns the collection.
* Otherwise if this BpmnLaneset has previously
* been saved, it will retrieve related BpmnLanes from storage.
* If this BpmnLaneset is new, it will return
* an empty collection or the current collection, the criteria
* is ignored on a new object.
*
* @param Connection $con
* @param Criteria $criteria
* @throws PropelException
*/
public function getBpmnLanes($criteria = null, $con = null)
{
// include the Peer class
include_once 'classes/model/om/BaseBpmnLanePeer.php';
if ($criteria === null) {
$criteria = new Criteria();
}
elseif ($criteria instanceof Criteria)
{
$criteria = clone $criteria;
}
if ($this->collBpmnLanes === null) {
if ($this->isNew()) {
$this->collBpmnLanes = array();
} else {
$criteria->add(BpmnLanePeer::LNS_UID, $this->getLnsUid());
BpmnLanePeer::addSelectColumns($criteria);
$this->collBpmnLanes = BpmnLanePeer::doSelect($criteria, $con);
}
} else {
// criteria has no effect for a new object
if (!$this->isNew()) {
// the following code is to determine if a new query is
// called for. If the criteria is the same as the last
// one, just return the collection.
$criteria->add(BpmnLanePeer::LNS_UID, $this->getLnsUid());
BpmnLanePeer::addSelectColumns($criteria);
if (!isset($this->lastBpmnLaneCriteria) || !$this->lastBpmnLaneCriteria->equals($criteria)) {
$this->collBpmnLanes = BpmnLanePeer::doSelect($criteria, $con);
}
}
}
$this->lastBpmnLaneCriteria = $criteria;
return $this->collBpmnLanes;
}
/**
* Returns the number of related BpmnLanes.
*
* @param Criteria $criteria
* @param boolean $distinct
* @param Connection $con
* @throws PropelException
*/
public function countBpmnLanes($criteria = null, $distinct = false, $con = null)
{
// include the Peer class
include_once 'classes/model/om/BaseBpmnLanePeer.php';
if ($criteria === null) {
$criteria = new Criteria();
}
elseif ($criteria instanceof Criteria)
{
$criteria = clone $criteria;
}
$criteria->add(BpmnLanePeer::LNS_UID, $this->getLnsUid());
return BpmnLanePeer::doCount($criteria, $distinct, $con);
}
/**
* Method called to associate a BpmnLane object to this object
* through the BpmnLane foreign key attribute
*
* @param BpmnLane $l BpmnLane
* @return void
* @throws PropelException
*/
public function addBpmnLane(BpmnLane $l)
{
$this->collBpmnLanes[] = $l;
$l->setBpmnLaneset($this);
}
/**
* If this collection has already been initialized with
* an identical criteria, it returns the collection.
* Otherwise if this BpmnLaneset is new, it will return
* an empty collection; or if this BpmnLaneset has previously
* been saved, it will retrieve related BpmnLanes from storage.
*
* This method is protected by default in order to keep the public
* api reasonable. You can provide public methods for those you
* actually need in BpmnLaneset.
*/
public function getBpmnLanesJoinBpmnProject($criteria = null, $con = null)
{
// include the Peer class
include_once 'classes/model/om/BaseBpmnLanePeer.php';
if ($criteria === null) {
$criteria = new Criteria();
}
elseif ($criteria instanceof Criteria)
{
$criteria = clone $criteria;
}
if ($this->collBpmnLanes === null) {
if ($this->isNew()) {
$this->collBpmnLanes = array();
} else {
$criteria->add(BpmnLanePeer::LNS_UID, $this->getLnsUid());
$this->collBpmnLanes = BpmnLanePeer::doSelectJoinBpmnProject($criteria, $con);
}
} else {
// the following code is to determine if a new query is
// called for. If the criteria is the same as the last
// one, just return the collection.
$criteria->add(BpmnLanePeer::LNS_UID, $this->getLnsUid());
if (!isset($this->lastBpmnLaneCriteria) || !$this->lastBpmnLaneCriteria->equals($criteria)) {
$this->collBpmnLanes = BpmnLanePeer::doSelectJoinBpmnProject($criteria, $con);
}
}
$this->lastBpmnLaneCriteria = $criteria;
return $this->collBpmnLanes;
}
}

49
workflow/engine/classes/model/om/BaseBpmnProject.php
View File

@@ -3284,55 +3284,6 @@ abstract class BaseBpmnProject extends BaseObject implements Persistent
$l->setBpmnProject($this);
}
/**
* If this collection has already been initialized with
* an identical criteria, it returns the collection.
* Otherwise if this BpmnProject is new, it will return
* an empty collection; or if this BpmnProject has previously
* been saved, it will retrieve related BpmnLanes from storage.
*
* This method is protected by default in order to keep the public
* api reasonable. You can provide public methods for those you
* actually need in BpmnProject.
*/
public function getBpmnLanesJoinBpmnLaneset($criteria = null, $con = null)
{
// include the Peer class
include_once 'classes/model/om/BaseBpmnLanePeer.php';
if ($criteria === null) {
$criteria = new Criteria();
}
elseif ($criteria instanceof Criteria)
{
$criteria = clone $criteria;
}
if ($this->collBpmnLanes === null) {
if ($this->isNew()) {
$this->collBpmnLanes = array();
} else {
$criteria->add(BpmnLanePeer::PRJ_UID, $this->getPrjUid());
$this->collBpmnLanes = BpmnLanePeer::doSelectJoinBpmnLaneset($criteria, $con);
}
} else {
// the following code is to determine if a new query is
// called for. If the criteria is the same as the last
// one, just return the collection.
$criteria->add(BpmnLanePeer::PRJ_UID, $this->getPrjUid());
if (!isset($this->lastBpmnLaneCriteria) || !$this->lastBpmnLaneCriteria->equals($criteria)) {
$this->collBpmnLanes = BpmnLanePeer::doSelectJoinBpmnLaneset($criteria, $con);
}
}
$this->lastBpmnLaneCriteria = $criteria;
return $this->collBpmnLanes;
}
/**
* Temporary storage of collBpmnParticipants to save a possible db hit in
* the event objects are add to the collection, but the