Author: david
Date: Tue May 17 16:18:56 2011
New Revision: 9105
Log:
source and target may not be tables, rename columns. Index all keymap columns.
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
trunk/lib/model/map/KeymapTableMap.php
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/UserTableMap.php
trunk/lib/model/om/BaseKeymap.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseUser.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Tue May 17 16:16:51 2011 (r9104)
+++ trunk/config/schema.yml Tue May 17 16:18:56 2011 (r9105)
@@ -149,10 +149,10 @@
revision_history: longvarchar
keymap:
- source_id: integer
- target_id: integer
- source_table: longvarchar
- target_table: longvarchar
+ source_id: { type: integer, index: true }
+ target_id: { type: integer, index: true }
+ source: { type: longvarchar, index: true }
+ target: { type: longvarchar, index: true }
map:
created_at:
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Tue May 17 16:16:51 2011 (r9104)
+++ trunk/data/sql/lib.model.schema.sql Tue May 17 16:18:56 2011 (r9105)
@@ -47,7 +47,7 @@
CONSTRAINT `actor_FK_5`
FOREIGN KEY (`parent_id`)
REFERENCES `actor` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- actor_i18n
@@ -78,7 +78,7 @@
FOREIGN KEY (`id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- contact_information
@@ -112,7 +112,7 @@
FOREIGN KEY (`actor_id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- contact_information_i18n
@@ -134,7 +134,7 @@
FOREIGN KEY (`id`)
REFERENCES `contact_information` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- digital_object
@@ -187,7 +187,7 @@
CONSTRAINT `digital_object_FK_6`
FOREIGN KEY (`parent_id`)
REFERENCES `digital_object` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- event
@@ -226,7 +226,7 @@
CONSTRAINT `event_FK_4`
FOREIGN KEY (`actor_id`)
REFERENCES `actor` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- event_i18n
@@ -247,7 +247,7 @@
FOREIGN KEY (`id`)
REFERENCES `event` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- function
@@ -289,7 +289,7 @@
CONSTRAINT `function_FK_5`
FOREIGN KEY (`description_detail_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- function_i18n
@@ -317,7 +317,7 @@
FOREIGN KEY (`id`)
REFERENCES `function` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- historical_event
@@ -343,7 +343,7 @@
CONSTRAINT `historical_event_FK_2`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- information_object
@@ -401,7 +401,7 @@
FOREIGN KEY (`description_detail_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- information_object_i18n
@@ -440,7 +440,7 @@
FOREIGN KEY (`id`)
REFERENCES `information_object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- keymap
@@ -453,12 +453,16 @@
(
`source_id` INTEGER,
`target_id` INTEGER,
- `source_table` TEXT,
- `target_table` TEXT,
+ `source` TEXT,
+ `target` TEXT,
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
- PRIMARY KEY (`id`)
-)Engine=InnoDB;
+ PRIMARY KEY (`id`),
+ KEY `keymap_I_1`(`source_id`),
+ KEY `keymap_I_2`(`target_id`),
+ KEY `keymap_I_3`(`source`),
+ KEY `keymap_I_4`(`target`)
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- map
@@ -475,7 +479,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- map_i18n
@@ -495,7 +499,7 @@
FOREIGN KEY (`id`)
REFERENCES `map` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- menu
@@ -522,7 +526,7 @@
FOREIGN KEY (`parent_id`)
REFERENCES `menu` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- menu_i18n
@@ -542,7 +546,7 @@
FOREIGN KEY (`id`)
REFERENCES `menu` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- note
@@ -584,7 +588,7 @@
CONSTRAINT `note_FK_4`
FOREIGN KEY (`parent_id`)
REFERENCES `note` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- note_i18n
@@ -603,7 +607,7 @@
FOREIGN KEY (`id`)
REFERENCES `note` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- oai_harvest
@@ -630,7 +634,7 @@
FOREIGN KEY (`oai_repository_id`)
REFERENCES `oai_repository` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- oai_repository
@@ -650,7 +654,7 @@
`updated_at` DATETIME NOT NULL,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- object
@@ -667,7 +671,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- object_term_relation
@@ -698,7 +702,7 @@
FOREIGN KEY (`term_id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- other_name
@@ -727,7 +731,7 @@
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- other_name_i18n
@@ -747,7 +751,7 @@
FOREIGN KEY (`id`)
REFERENCES `other_name` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- physical_object
@@ -778,7 +782,7 @@
CONSTRAINT `physical_object_FK_3`
FOREIGN KEY (`parent_id`)
REFERENCES `physical_object` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- physical_object_i18n
@@ -799,7 +803,7 @@
FOREIGN KEY (`id`)
REFERENCES `physical_object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- place
@@ -830,7 +834,7 @@
CONSTRAINT `place_FK_3`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- place_i18n
@@ -852,7 +856,7 @@
FOREIGN KEY (`id`)
REFERENCES `place` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- place_map_relation
@@ -892,7 +896,7 @@
CONSTRAINT `place_map_relation_FK_5`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- property
@@ -917,7 +921,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- property_i18n
@@ -936,7 +940,7 @@
FOREIGN KEY (`id`)
REFERENCES `property` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- relation
@@ -970,7 +974,7 @@
CONSTRAINT `relation_FK_4`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- repository
@@ -1002,7 +1006,7 @@
FOREIGN KEY (`desc_detail_id`)
REFERENCES `term` (`id`)
ON DELETE SET NULL
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- repository_i18n
@@ -1035,7 +1039,7 @@
FOREIGN KEY (`id`)
REFERENCES `repository` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- rights
@@ -1063,7 +1067,7 @@
CONSTRAINT `rights_FK_2`
FOREIGN KEY (`permission_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_i18n
@@ -1082,7 +1086,7 @@
FOREIGN KEY (`id`)
REFERENCES `rights` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_actor_relation
@@ -1116,7 +1120,7 @@
CONSTRAINT `rights_actor_relation_FK_4`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- rights_term_relation
@@ -1150,7 +1154,7 @@
CONSTRAINT `rights_term_relation_FK_3`
FOREIGN KEY (`type_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- setting
@@ -1169,7 +1173,7 @@
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
PRIMARY KEY (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- setting_i18n
@@ -1188,7 +1192,7 @@
FOREIGN KEY (`id`)
REFERENCES `setting` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- slug
@@ -1210,7 +1214,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- static_page
@@ -1228,7 +1232,7 @@
FOREIGN KEY (`id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- static_page_i18n
@@ -1248,7 +1252,7 @@
FOREIGN KEY (`id`)
REFERENCES `static_page` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- status
@@ -1282,7 +1286,7 @@
FOREIGN KEY (`status_id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- system_event
@@ -1313,7 +1317,7 @@
CONSTRAINT `system_event_FK_2`
FOREIGN KEY (`user_id`)
REFERENCES `user` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- taxonomy
@@ -1341,7 +1345,7 @@
CONSTRAINT `taxonomy_FK_2`
FOREIGN KEY (`parent_id`)
REFERENCES `taxonomy` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- taxonomy_i18n
@@ -1361,7 +1365,7 @@
FOREIGN KEY (`id`)
REFERENCES `taxonomy` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- term
@@ -1393,7 +1397,7 @@
CONSTRAINT `term_FK_3`
FOREIGN KEY (`parent_id`)
REFERENCES `term` (`id`)
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- term_i18n
@@ -1412,7 +1416,7 @@
FOREIGN KEY (`id`)
REFERENCES `term` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- user
@@ -1433,7 +1437,7 @@
FOREIGN KEY (`id`)
REFERENCES `actor` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
Modified: trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
==============================================================================
--- trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue May 17
16:16:51 2011 (r9104)
+++ trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue May 17
16:18:56 2011 (r9105)
@@ -26,7 +26,7 @@
FOREIGN KEY (`parent_id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_group_i18n
@@ -46,7 +46,7 @@
FOREIGN KEY (`id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_permission
@@ -84,7 +84,7 @@
FOREIGN KEY (`object_id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
#-----------------------------------------------------------------------------
#-- acl_user_group
@@ -110,7 +110,7 @@
FOREIGN KEY (`group_id`)
REFERENCES `acl_group` (`id`)
ON DELETE CASCADE
-)Engine=InnoDB;
+)Type=InnoDB;
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
Modified: trunk/lib/model/map/KeymapTableMap.php
==============================================================================
--- trunk/lib/model/map/KeymapTableMap.php Tue May 17 16:16:51 2011
(r9104)
+++ trunk/lib/model/map/KeymapTableMap.php Tue May 17 16:18:56 2011
(r9105)
@@ -38,8 +38,8 @@
// columns
$this->addColumn('SOURCE_ID', 'sourceId', 'INTEGER', false,
null, null);
$this->addColumn('TARGET_ID', 'targetId', 'INTEGER', false,
null, null);
- $this->addColumn('SOURCE_TABLE', 'sourceTable', 'LONGVARCHAR',
false, null, null);
- $this->addColumn('TARGET_TABLE', 'targetTable', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('SOURCE', 'source', 'LONGVARCHAR', false,
null, null);
+ $this->addColumn('TARGET', 'target', 'LONGVARCHAR', false,
null, null);
$this->addPrimaryKey('ID', 'id', 'INTEGER', true, null, null);
$this->addColumn('SERIAL_NUMBER', 'serialNumber', 'INTEGER',
true, null, 0);
// validators
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Tue May 17 16:16:51 2011
(r9104)
+++ trunk/lib/model/map/ObjectTableMap.php Tue May 17 16:18:56 2011
(r9105)
@@ -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 Tue May 17 16:16:51 2011
(r9104)
+++ trunk/lib/model/map/UserTableMap.php Tue May 17 16:18:56 2011
(r9105)
@@ -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/BaseKeymap.php
==============================================================================
--- trunk/lib/model/om/BaseKeymap.php Tue May 17 16:16:51 2011 (r9104)
+++ trunk/lib/model/om/BaseKeymap.php Tue May 17 16:18:56 2011 (r9105)
@@ -9,8 +9,8 @@
SOURCE_ID = 'keymap.SOURCE_ID',
TARGET_ID = 'keymap.TARGET_ID',
- SOURCE_TABLE = 'keymap.SOURCE_TABLE',
- TARGET_TABLE = 'keymap.TARGET_TABLE',
+ SOURCE = 'keymap.SOURCE',
+ TARGET = 'keymap.TARGET',
ID = 'keymap.ID',
SERIAL_NUMBER = 'keymap.SERIAL_NUMBER';
@@ -18,8 +18,8 @@
{
$criteria->addSelectColumn(QubitKeymap::SOURCE_ID);
$criteria->addSelectColumn(QubitKeymap::TARGET_ID);
- $criteria->addSelectColumn(QubitKeymap::SOURCE_TABLE);
- $criteria->addSelectColumn(QubitKeymap::TARGET_TABLE);
+ $criteria->addSelectColumn(QubitKeymap::SOURCE);
+ $criteria->addSelectColumn(QubitKeymap::TARGET);
$criteria->addSelectColumn(QubitKeymap::ID);
$criteria->addSelectColumn(QubitKeymap::SERIAL_NUMBER);
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Tue May 17 16:16:51 2011 (r9104)
+++ trunk/lib/model/om/BaseObject.php Tue May 17 16:18:56 2011 (r9105)
@@ -180,6 +180,11 @@
}
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
if ('notes' == $name)
{
return true;
@@ -225,11 +230,6 @@
return true;
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -271,6 +271,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 +441,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 +739,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 +939,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/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Tue May 17 16:16:51 2011 (r9104)
+++ trunk/lib/model/om/BaseUser.php Tue May 17 16:18:56 2011 (r9105)
@@ -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);
}
}
--
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.
