Author: david
Date: Tue Nov  3 11:54:39 2009
New Revision: 3862

Log:
Only set authenticated group as parent for new groups (Don't modify existing 
group parent). Fixes issue #1102.

Modified:
   trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editAction.class.php

Modified: 
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editAction.class.php
==============================================================================
--- trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editAction.class.php     
Tue Nov  3 00:13:28 2009        (r3861)
+++ trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editAction.class.php     
Tue Nov  3 11:54:39 2009        (r3862)
@@ -91,8 +91,12 @@
     $this->group->name = $this->request->getParameter('name');
     $this->group->description = $this->request->getParameter('description');
 
-    // Inherit permissions from authenticated group
-    $this->group->parentId = QubitAclGroup::AUTHENTICATED_ID;
+    if (null === $this->group->parentId)
+    {
+      // By default, inherit permissions from authenticated group
+      $this->group->parentId = QubitAclGroup::AUTHENTICATED_ID;
+    }
+
     $this->group->save();
 
     $this->updatePermissions();

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to