Changes between Version 6 and Version 7 of S3/S3AAA/OrgAuth

Timestamp:

01/06/12 12:19:31 (13 years ago)

Author:

Fran Boon

Comment:

fix

S3/S3AAA/OrgAuth

@@ -29 +29 @@
 In OrgAuth, any applicable ACL is automatically restricted to the records of those organisations (policy 6) or organisations+facilities (policy 7) for which the user has the respective access roles. This applies to both, user-ACLs (uacl) and owner-ACLs (oacl).
 
-It is possible to override this restriction in the ACL itself, and explicitly define for which organisation/facility the ACL shall apply (see [DelegationsofPermissions Delegations of Permissions]), or to define that the ACL shall apply for the records of ''all'' organisations/facilities (see [#GeneralDelegationsofPermissions General Delegations of Permissions]).
+It is possible to override this restriction in the ACL itself, and explicitly define for which organisation/facility the ACL shall apply (see [#DelegationsofPermissions Delegations of Permissions]), or to define that the ACL shall apply for the records of ''all'' organisations/facilities (see [#GeneralDelegationsofPermissions General Delegations of Permissions]).
 
 == Delegations of Permissions ==
@@ -41 +41 @@
 {{{
     # Get the access role from the organisation record
-    org_record = db(db.org_organisation.id == my_org_id).select(db.org_organisation.owned_by_role,
+    org_record = db(db.org_organisation.id == my_org_id).select(db.org_organisation.owned_by_organisation,
                                                                 limitby=(0, 1)).first()
 
     # Delegate read permission for this organisation's inv_inv_item record to all authenticated users
     update_acls(authenticated,
-                dict(t="inv_inv_item", uacl=acl.READ, organisation=org_record.owned_by_role))
+                dict(t="inv_inv_item", uacl=acl.READ, organisation=org_record.owned_by_organisation))
 }}}
 
@@ -53 +53 @@
 {{{
     # Get the access role for this organisation
-    this_org = db(db.org_organisation.id == my_org_id).select(db.org_organisation.owned_by_role,
+    this_org = db(db.org_organisation.id == my_org_id).select(db.org_organisation.owned_by_organisation,
                                                               limitby=(0, 1)).first()
 
     # Get the access role for the other organisation
-    other_org = db(db.org_organisation.id == other_org_id).select(db.org_organisation.owned_by_role,
+    other_org = db(db.org_organisation.id == other_org_id).select(db.org_organisation.owned_by_organisation,
                                                                   limitby=(0, 1)).first()
 
     # Delegate read permission for this organisation's inv_inv_item record to all authenticated users
     update_acls(other_org.owned_by_role,
-                dict(t="inv_inv_item", uacl=acl.READ, organisation=this_org.owned_by_role))
+                dict(t="inv_inv_item", uacl=acl.READ, organisation=this_org.owned_by_organisation))
 }}}