Author: david
Date: Tue Sep 8 14:47:08 2009
New Revision: 3193
Log:
Drop q_acl_condition table from ACL schema.
Deleted:
trunk/plugins/qbAclPlugin/lib/model/QubitAclCondition.php
trunk/plugins/qbAclPlugin/lib/model/QubitAclPermissionCondition.php
trunk/plugins/qbAclPlugin/lib/model/map/AclConditionMapBuilder.php
trunk/plugins/qbAclPlugin/lib/model/map/AclPermissionConditionMapBuilder.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclCondition.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermissionCondition.php
Modified:
trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
trunk/plugins/qbAclPlugin/config/schema.yml
trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php
trunk/plugins/qbAclPlugin/lib/model/map/AclPermissionMapBuilder.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
Modified: trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql
==============================================================================
--- trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue Sep 8
14:36:54 2009 (r3192)
+++ trunk/data/sql/plugins.qbAclPlugin.lib.model.schema.sql Tue Sep 8
14:47:08 2009 (r3193)
@@ -20,21 +20,6 @@
)Type=InnoDB;
#-----------------------------------------------------------------------------
-#-- q_acl_condition
-#-----------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS `q_acl_condition`;
-
-
-CREATE TABLE `q_acl_condition`
-(
- `id` INTEGER NOT NULL AUTO_INCREMENT,
- `name` VARCHAR(255),
- `definition` TEXT,
- PRIMARY KEY (`id`)
-)Type=InnoDB;
-
-#-----------------------------------------------------------------------------
#-- q_acl_group
#-----------------------------------------------------------------------------
@@ -70,6 +55,7 @@
`object_id` INTEGER,
`action_id` INTEGER NOT NULL,
`grant_deny` INTEGER default 0 NOT NULL,
+ `conditional` TEXT,
PRIMARY KEY (`id`),
INDEX `q_acl_permission_FI_1` (`group_id`),
CONSTRAINT `q_acl_permission_FK_1`
@@ -89,31 +75,6 @@
)Type=InnoDB;
#-----------------------------------------------------------------------------
-#-- q_acl_permission_condition
-#-----------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS `q_acl_permission_condition`;
-
-
-CREATE TABLE `q_acl_permission_condition`
-(
- `id` INTEGER NOT NULL AUTO_INCREMENT,
- `permission_id` INTEGER NOT NULL,
- `condition_id` INTEGER NOT NULL,
- PRIMARY KEY (`id`),
- INDEX `q_acl_permission_condition_FI_1` (`permission_id`),
- CONSTRAINT `q_acl_permission_condition_FK_1`
- FOREIGN KEY (`permission_id`)
- REFERENCES `q_acl_permission` (`id`)
- ON DELETE CASCADE,
- INDEX `q_acl_permission_condition_FI_2` (`condition_id`),
- CONSTRAINT `q_acl_permission_condition_FK_2`
- FOREIGN KEY (`condition_id`)
- REFERENCES `q_acl_condition` (`id`)
- ON DELETE CASCADE
-)Type=InnoDB;
-
-#-----------------------------------------------------------------------------
#-- q_acl_user_group
#-----------------------------------------------------------------------------
Modified: trunk/plugins/qbAclPlugin/config/schema.yml
==============================================================================
--- trunk/plugins/qbAclPlugin/config/schema.yml Tue Sep 8 14:36:54 2009
(r3192)
+++ trunk/plugins/qbAclPlugin/config/schema.yml Tue Sep 8 14:47:08 2009
(r3193)
@@ -7,12 +7,6 @@
name: { type: varchar, size: 255, required: true, index: unique }
description: { type: longvarchar }
- acl_condition:
- _attributes: { phpName: aclCondition }
- id: ~
- name: { type: varchar, size: 255 }
- definition: { type: longvarchar }
-
acl_group:
_attributes: { phpName: aclGroup }
id: ~
@@ -27,12 +21,7 @@
object_id: { type: integer, foreignTable: object, foreignReference:
id, onDelete: cascade }
action_id: { type: integer, required: true, foreignTable: acl_action,
foreignReference: id, onDelete: cascade }
grant_deny: { type: integer, required: true, default: 0 }
-
- acl_permission_condition:
- _attributes: { phpName: aclPermissionCondition }
- id: ~
- permission_id: { type: integer, required: true, foreignTable:
acl_permission, foreignReference: id, onDelete: cascade }
- condition_id: { type: integer, required: true, foreignTable:
acl_condition, foreignReference: id, onDelete: cascade }
+ conditional: { type: longvarchar }
acl_user_group:
_attributes: { phpName: aclUserGroup }
Modified: trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php Tue Sep 8
14:36:54 2009 (r3192)
+++ trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php Tue Sep 8
14:47:08 2009 (r3193)
@@ -19,4 +19,4 @@
class QubitAclPermission extends BaseAclPermission
{
-}
+}
\ No newline at end of file
Modified: trunk/plugins/qbAclPlugin/lib/model/map/AclPermissionMapBuilder.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/map/AclPermissionMapBuilder.php Tue Sep
8 14:36:54 2009 (r3192)
+++ trunk/plugins/qbAclPlugin/lib/model/map/AclPermissionMapBuilder.php Tue Sep
8 14:47:08 2009 (r3193)
@@ -43,5 +43,7 @@
$tMap->addColumn('GRANT_DENY', 'grantDeny', 'INTEGER', true,
null);
+ $tMap->addColumn('CONDITIONAL', 'conditional', 'LONGVARCHAR',
false, null);
+
}
}
\ No newline at end of file
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Tue Sep
8 14:36:54 2009 (r3192)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Tue Sep
8 14:47:08 2009 (r3193)
@@ -11,7 +11,8 @@
GROUP_ID = 'q_acl_permission.GROUP_ID',
OBJECT_ID = 'q_acl_permission.OBJECT_ID',
ACTION_ID = 'q_acl_permission.ACTION_ID',
- GRANT_DENY = 'q_acl_permission.GRANT_DENY';
+ GRANT_DENY = 'q_acl_permission.GRANT_DENY',
+ CONDITIONAL = 'q_acl_permission.CONDITIONAL';
public static function addSelectColumns(Criteria $criteria)
{
@@ -20,6 +21,7 @@
$criteria->addSelectColumn(QubitAclPermission::OBJECT_ID);
$criteria->addSelectColumn(QubitAclPermission::ACTION_ID);
$criteria->addSelectColumn(QubitAclPermission::GRANT_DENY);
+ $criteria->addSelectColumn(QubitAclPermission::CONDITIONAL);
return $criteria;
}
@@ -154,11 +156,6 @@
}
}
- if ('aclPermissionConditions' == $name)
- {
- return true;
- }
-
throw new sfException;
}
@@ -200,23 +197,6 @@
}
}
- if ('aclPermissionConditions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissionConditions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissionConditions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissionConditions'] =
self::getaclPermissionConditionsById($this->id, array('self' => $this) +
$options);
- }
- }
-
- return $this->refFkValues['aclPermissionConditions'];
- }
-
throw new sfException;
}
@@ -510,26 +490,6 @@
return $criteria;
}
- public static function addaclPermissionConditionsCriteriaById(Criteria
$criteria, $id)
- {
- $criteria->add(QubitAclPermissionCondition::PERMISSION_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionConditionsById($id, array $options =
array())
- {
- $criteria = new Criteria;
- self::addaclPermissionConditionsCriteriaById($criteria, $id);
-
- return QubitAclPermissionCondition::get($criteria, $options);
- }
-
- public function addaclPermissionConditionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionConditionsCriteriaById($criteria, $this->id);
- }
-
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
