Changeset 8943

Timestamp:

05/14/08 07:00:58 (5 months ago)

Author:

Jonathan.Wage

Message:

Fixes.

Files:

• plugins/sfGuardDoctrinePlugin/trunk/lib/model/doctrine/PluginsfGuardUser.class.php (modified) (3 diffs)
• plugins/sfGuardDoctrinePlugin/trunk/modules/sfGuardGroup/config/generator.yml (modified) (1 diff)
• plugins/sfGuardDoctrinePlugin/trunk/modules/sfGuardUser/config/generator.yml (modified) (1 diff)

plugins/sfGuardDoctrinePlugin/trunk/lib/model/doctrine/PluginsfGuardUser.class.php

@@ -140 +140 @@
-    $up = new sfGuardUserPermission();
-    $up->setsfGuardUser($this);
-f
+et
-
-    $up->save($con);
@@ -147 +147 @@
-  public function hasGroup($name)
-  {
-
-
-
-
-
+
-    return isset($this->groups[$name]);
-  }
-
-  public function getGroups()
-  {
-    if (!$this->groups)
-    {
-      $this->groups = array();
-
-      $ugs = Doctrine_Query::create()
-              ->from('sfGuardUserGroup ug')
-              ->leftJoin('ug.sfGuardGroup g')
-              ->where('ug.user_id = ?', $this->getId())
-              ->execute();
-
-      foreach ($ugs as $ug)
-      {
-        $group = $ug->getsfGuardGroup();
-        $this->groups[$group->getName()] = $group;
-      }
-    }
-
-    return $this->groups;
-  }
-
-  public function getGroupNames()
-  {
-
+
+
-  }
-
-  public function hasPermission($name)
-  {
-
-
-
-
-
+
-    return isset($this->permissions[$name]);
-  }
-
-  public function getPermissions()
-  {
-    if (!$this->permissions)
-    {
-      $this->permissions = array();
-
-      $ups = Doctrine_Query::create()
-              ->from('sfGuardUserPermission up')
-              ->leftJoin('up.sfGuardPermission p')
-              ->where('up.user_id = ?', $this->getId())
-              ->execute();
-
-      foreach ($ups as $up)
-      {
-        $permission = $up->getPermission();
-        $this->permissions[$permission->getName()] = $permission;
-      }
-    }
-
-    return $this->permissions;
-  }
-
-  public function getPermissionNames()
-  {
-
+
+
-  }
-
@@ -243 +193 @@
-  }
-
+  public function loadGroupsAndPermissions()
+  {
+    $this->getAllPermissions();
+    if (!$this->permissions)
+    {
+      $permissions = $this->getPermissions();
+      foreach ($permissions as $permission)
+      {
+        $this->permissions[$permission->getName()] = $permission;
+      }
+    }
+    if (!$this->groups)
+    {
+      $groups = $this->getGroups();
+      foreach ($groups as $group)
+      {
+        $this->groups[$group->getName()] = $group;
+      }
+    }
+  }
-  public function reloadGroupsAndPermissions()
-  {

plugins/sfGuardDoctrinePlugin/trunk/modules/sfGuardGroup/config/generator.yml

@@ -12 +12 @@
-      title:          Edit "%%name%%" group
-      fields:
-double
+check
-      display:        [ name, description, permissions ]

plugins/sfGuardDoctrinePlugin/trunk/modules/sfGuardUser/config/generator.yml

@@ -16 +16 @@
-        password:
-        password_bis:
-double
+check
-        permissions:  { name: Permissions, type: doctrine_admin_check_list, params: through_class=sfGuardUserPermission }
-        last_login:   { type: plain }