diff options
| author | Christian Fowler <spider@viovio.com> | 2007-07-11 17:42:30 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2007-07-11 17:42:30 +0000 |
| commit | c10081707e6b9ae4cd5091c6ce3d11c8cd03f858 (patch) | |
| tree | 14e3212847f0709a88435f0bfc15d3d1cc1db27e /admin | |
| parent | eeab814296d3fe8d3c6be27b9c466b371fec2527 (diff) | |
| download | liberty-c10081707e6b9ae4cd5091c6ce3d11c8cd03f858.tar.gz liberty-c10081707e6b9ae4cd5091c6ce3d11c8cd03f858.tar.bz2 liberty-c10081707e6b9ae4cd5091c6ce3d11c8cd03f858.zip | |
SCHEMA CHANGE: (minor) rename is_excluded to a more intuitive is_revoked for liberty_content_perms, also major update to hasUserPermission to get all permissions for the current user joined with perms for the current content. This should handle cases where non-default permissions is assigned, default permission is removed, and duplicate default permissions where one group's perm is revoked, but another is still permitted.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/schema_inc.php | 2 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 1bfddf0..f9f1fa3 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -183,7 +183,7 @@ $tables = array( group_id I4 PRIMARY, perm_name C(30) PRIMARY, content_id I4 PRIMARY, - is_excluded C(1) + is_revoked C(1) CONSTRAINT ' , CONSTRAINT `liberty_content_perm_perm_ref` FOREIGN KEY (`perm_name`) REFERENCES `".BIT_DB_PREFIX."users_permissions` (`perm_name`) , CONSTRAINT `liberty_content_id_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)' diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 4f9e8e6..2e99b53 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -97,7 +97,7 @@ array( 'DATADICT' => array( ), 'liberty_content_permissions' => array( 'object_id' => array( '`content_id`', 'I4' ), - 'is_excluded' => array( '`is_exluded`', 'VARCHAR(1)' ), + 'is_revoked' => array( '`is_exluded`', 'VARCHAR(1)' ), ), )), /* The installer can't add constraints after table creation yet so drop this constraint. |