Author: david
Date: Thu Oct 14 17:03:26 2010
New Revision: 8148
Log:
content of \$rows parameter is dependant on calling class.
Modified:
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/UserTableMap.php
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObjectI18n.php
trunk/lib/model/om/BaseMap.php
trunk/lib/model/om/BaseMapI18n.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BaseMenuI18n.php
trunk/lib/model/om/BaseNote.php
trunk/lib/model/om/BaseNoteI18n.php
trunk/lib/model/om/BaseOaiHarvest.php
trunk/lib/model/om/BaseOaiRepository.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
trunk/lib/model/om/BasePhysicalObjectI18n.php
trunk/lib/model/om/BasePlaceI18n.php
trunk/lib/model/om/BaseProperty.php
trunk/lib/model/om/BasePropertyI18n.php
trunk/lib/model/om/BaseRepositoryI18n.php
trunk/lib/model/om/BaseRights.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseRightsTermRelation.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseSlug.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseSystemEvent.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/model/om/BaseUser.php
trunk/lib/propel/builder/QubitObjectBuilder.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/map/ObjectTableMap.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -49,6 +49,7 @@
*/
public function buildRelations()
{
+ $this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('actor', 'actor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('digitalObject', 'digitalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('event', 'event', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
@@ -71,7 +72,6 @@
$this->addRelation('status', 'status', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('term', 'term', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/UserTableMap.php
==============================================================================
--- trunk/lib/model/map/UserTableMap.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/map/UserTableMap.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -50,10 +50,10 @@
public function buildRelations()
{
$this->addRelation('actor', 'actor', RelationMap::MANY_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
- $this->addRelation('note', 'note', RelationMap::ONE_TO_MANY, array('id' =>
'user_id', ), null, null);
- $this->addRelation('systemEvent', 'systemEvent', RelationMap::ONE_TO_MANY,
array('id' => 'user_id', ), null, null);
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), 'CASCADE', null);
$this->addRelation('aclUserGroup', 'aclUserGroup',
RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), 'CASCADE', null);
+ $this->addRelation('note', 'note', RelationMap::ONE_TO_MANY, array('id' =>
'user_id', ), null, null);
+ $this->addRelation('systemEvent', 'systemEvent', RelationMap::ONE_TO_MANY,
array('id' => 'user_id', ), null, null);
} // buildRelations()
} // UserTableMap
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseActorI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -56,6 +56,7 @@
$keys = array();
$keys['id'] = $row[13];
$keys['culture'] = $row[14];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$actorI18ns[$key]))
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/model/om/BaseContactInformation.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -59,6 +59,7 @@
{
$keys = array();
$keys['id'] = $row[15];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$contactInformations[$key]))
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -38,6 +38,7 @@
$keys = array();
$keys['id'] = $row[4];
$keys['culture'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$contactInformationI18ns[$key]))
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseEventI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -36,6 +36,7 @@
$keys = array();
$keys['id'] = $row[3];
$keys['culture'] = $row[4];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$eventI18ns[$key]))
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseFunctionI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -50,6 +50,7 @@
$keys = array();
$keys['id'] = $row[10];
$keys['culture'] = $row[11];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$functionI18ns[$key]))
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -72,6 +72,7 @@
$keys = array();
$keys['id'] = $row[21];
$keys['culture'] = $row[22];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$informationObjectI18ns[$key]))
Modified: trunk/lib/model/om/BaseMap.php
==============================================================================
--- trunk/lib/model/om/BaseMap.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseMap.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -35,6 +35,7 @@
{
$keys = array();
$keys['id'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$maps[$key]))
Modified: trunk/lib/model/om/BaseMapI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMapI18n.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseMapI18n.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$mapI18ns[$key]))
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseMenu.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -45,6 +45,7 @@
{
$keys = array();
$keys['id'] = $row[8];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$menus[$key]))
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseMenuI18n.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$menuI18ns[$key]))
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseNote.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -49,6 +49,7 @@
{
$keys = array();
$keys['id'] = $row[10];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$notes[$key]))
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseNoteI18n.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -32,6 +32,7 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$noteI18ns[$key]))
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseOaiHarvest.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -45,6 +45,7 @@
{
$keys = array();
$keys['id'] = $row[0];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$oaiHarvests[$key]))
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseOaiRepository.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -41,6 +41,7 @@
{
$keys = array();
$keys['id'] = $row[0];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$oaiRepositorys[$key]))
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseObject.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -35,6 +35,7 @@
{
$keys = array();
$keys['id'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$objects[$key]))
@@ -180,6 +181,11 @@
}
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
if ('notes' == $name)
{
return true;
@@ -225,11 +231,6 @@
return true;
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -271,6 +272,23 @@
}
}
+ if ('aclPermissions' == $name)
+ {
+ if (!isset($this->refFkValues['aclPermissions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['aclPermissions'];
+ }
+
if ('notes' == $name)
{
if (!isset($this->refFkValues['notes']))
@@ -424,23 +442,6 @@
return $this->refFkValues['statuss'];
}
- if ('aclPermissions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['aclPermissions'];
- }
-
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -739,6 +740,26 @@
$this->setid($key);
}
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::OBJECT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::OBJECT_ID, $id);
@@ -919,26 +940,6 @@
return self::addstatussCriteriaById($criteria, $this->id);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::OBJECT_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseOtherName.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -39,6 +39,7 @@
{
$keys = array();
$keys['id'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$otherNames[$key]))
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$otherNameI18ns[$key]))
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -36,6 +36,7 @@
$keys = array();
$keys['id'] = $row[3];
$keys['culture'] = $row[4];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$physicalObjectI18ns[$key]))
Modified: trunk/lib/model/om/BasePlaceI18n.php
==============================================================================
--- trunk/lib/model/om/BasePlaceI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BasePlaceI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -38,6 +38,7 @@
$keys = array();
$keys['id'] = $row[4];
$keys['culture'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$placeI18ns[$key]))
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseProperty.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -41,6 +41,7 @@
{
$keys = array();
$keys['id'] = $row[6];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$propertys[$key]))
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BasePropertyI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -32,6 +32,7 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$propertyI18ns[$key]))
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -60,6 +60,7 @@
$keys = array();
$keys['id'] = $row[15];
$keys['culture'] = $row[16];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$repositoryI18ns[$key]))
Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseRights.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -39,6 +39,7 @@
{
$keys = array();
$keys['id'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightss[$key]))
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseRightsI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -32,6 +32,7 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightsI18ns[$key]))
Modified: trunk/lib/model/om/BaseRightsTermRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRightsTermRelation.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/model/om/BaseRightsTermRelation.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -41,6 +41,7 @@
{
$keys = array();
$keys['id'] = $row[6];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$rightsTermRelations[$key]))
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseSetting.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -39,6 +39,7 @@
{
$keys = array();
$keys['id'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$settings[$key]))
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseSettingI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -32,6 +32,7 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$settingI18ns[$key]))
Modified: trunk/lib/model/om/BaseSlug.php
==============================================================================
--- trunk/lib/model/om/BaseSlug.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseSlug.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -33,6 +33,7 @@
{
$keys = array();
$keys['id'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$slugs[$key]))
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$staticPageI18ns[$key]))
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseStatus.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -39,6 +39,7 @@
{
$keys = array();
$keys['id'] = $row[5];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$statuss[$key]))
Modified: trunk/lib/model/om/BaseSystemEvent.php
==============================================================================
--- trunk/lib/model/om/BaseSystemEvent.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseSystemEvent.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -47,6 +47,7 @@
{
$keys = array();
$keys['id'] = $row[9];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$systemEvents[$key]))
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Thu Oct 14 16:58:22 2010
(r8147)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Thu Oct 14 17:03:26 2010
(r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$taxonomyI18ns[$key]))
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseTermI18n.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -32,6 +32,7 @@
$keys = array();
$keys['id'] = $row[1];
$keys['culture'] = $row[2];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$termI18ns[$key]))
Modified: trunk/lib/model/om/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Thu Oct 14 16:58:22 2010 (r8147)
+++ trunk/lib/model/om/BaseUser.php Thu Oct 14 17:03:26 2010 (r8148)
@@ -82,22 +82,22 @@
{
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
return true;
}
@@ -123,154 +123,154 @@
{
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['notes']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['notes'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['notes'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclUserGroups'];
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['notes'];
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['systemEvents']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['systemEvents'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['systemEvents'];
}
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
- public static function addnotesCriteriaById(Criteria $criteria, $id)
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitNote::USER_ID, $id);
+ $criteria->add(QubitAclPermission::USER_ID, $id);
return $criteria;
}
- public static function getnotesById($id, array $options = array())
+ public static function getaclPermissionsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addnotesCriteriaById($criteria, $id);
+ self::addaclPermissionsCriteriaById($criteria, $id);
- return QubitNote::get($criteria, $options);
+ return QubitAclPermission::get($criteria, $options);
}
- public function addnotesCriteria(Criteria $criteria)
+ public function addaclPermissionsCriteria(Criteria $criteria)
{
- return self::addnotesCriteriaById($criteria, $this->id);
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
}
- public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
+ public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitSystemEvent::USER_ID, $id);
+ $criteria->add(QubitAclUserGroup::USER_ID, $id);
return $criteria;
}
- public static function getsystemEventsById($id, array $options = array())
+ public static function getaclUserGroupsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addsystemEventsCriteriaById($criteria, $id);
+ self::addaclUserGroupsCriteriaById($criteria, $id);
- return QubitSystemEvent::get($criteria, $options);
+ return QubitAclUserGroup::get($criteria, $options);
}
- public function addsystemEventsCriteria(Criteria $criteria)
+ public function addaclUserGroupsCriteria(Criteria $criteria)
{
- return self::addsystemEventsCriteriaById($criteria, $this->id);
+ return self::addaclUserGroupsCriteriaById($criteria, $this->id);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ public static function addnotesCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclPermission::USER_ID, $id);
+ $criteria->add(QubitNote::USER_ID, $id);
return $criteria;
}
- public static function getaclPermissionsById($id, array $options = array())
+ public static function getnotesById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
+ self::addnotesCriteriaById($criteria, $id);
- return QubitAclPermission::get($criteria, $options);
+ return QubitNote::get($criteria, $options);
}
- public function addaclPermissionsCriteria(Criteria $criteria)
+ public function addnotesCriteria(Criteria $criteria)
{
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ return self::addnotesCriteriaById($criteria, $this->id);
}
- public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
+ public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclUserGroup::USER_ID, $id);
+ $criteria->add(QubitSystemEvent::USER_ID, $id);
return $criteria;
}
- public static function getaclUserGroupsById($id, array $options = array())
+ public static function getsystemEventsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclUserGroupsCriteriaById($criteria, $id);
+ self::addsystemEventsCriteriaById($criteria, $id);
- return QubitAclUserGroup::get($criteria, $options);
+ return QubitSystemEvent::get($criteria, $options);
}
- public function addaclUserGroupsCriteria(Criteria $criteria)
+ public function addsystemEventsCriteria(Criteria $criteria)
{
- return self::addaclUserGroupsCriteriaById($criteria, $this->id);
+ return self::addsystemEventsCriteriaById($criteria, $this->id);
}
}
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Thu Oct 14 16:58:22
2010 (r8147)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Thu Oct 14 17:03:26
2010 (r8148)
@@ -371,6 +371,13 @@
\$keys['{$this->getColumnVarName($primaryKey)}'] = \$row[$position];
keys;
}
+
+ // The $row array passed to getFromRow is specific to the calling class so
+ // make sure we don't cache an incompatible object
+ $keys[] = <<<keys
+ \$keys['calledClass'] = get_called_class();
+keys;
+
$keys = implode("\n", $keys);
$script .= <<<script
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Oct 14
16:58:22 2010 (r8147)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Oct 14
17:03:26 2010 (r8148)
@@ -41,6 +41,7 @@
{
$keys = array();
$keys['id'] = $row[0];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclGroups[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Oct 14
16:58:22 2010 (r8147)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Oct 14
17:03:26 2010 (r8148)
@@ -34,6 +34,7 @@
$keys = array();
$keys['id'] = $row[2];
$keys['culture'] = $row[3];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclGroupI18ns[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Oct
14 16:58:22 2010 (r8147)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Oct
14 17:03:26 2010 (r8148)
@@ -47,6 +47,7 @@
{
$keys = array();
$keys['id'] = $row[0];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclPermissions[$key]))
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Oct 14
16:58:22 2010 (r8147)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Oct 14
17:03:26 2010 (r8148)
@@ -33,6 +33,7 @@
{
$keys = array();
$keys['id'] = $row[0];
+ $keys['calledClass'] = get_called_class();
$key = serialize($keys);
if (!isset(self::$aclUserGroups[$key]))
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
