# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1249206590 -19800
# Node ID 7a595f688ab5e2054b92a348b58b63f3879419a8
# Parent  db544114b158ecd4af22a342287e5035e7343320
Add parent parameter to accommodate entity groups.

diff -r db544114b158 -r 7a595f688ab5 app/soc/logic/models/base.py
--- a/app/soc/logic/models/base.py	Sun Aug 02 15:20:00 2009 +0530
+++ b/app/soc/logic/models/base.py	Sun Aug 02 15:19:50 2009 +0530
@@ -198,11 +198,12 @@
 
     return key_fields
 
-  def getFromKeyName(self, key_name):
-    """"Returns entity for key_name or None if not found.
+  def getFromKeyName(self, key_name, parent=None):
+    """Returns entity for key_name or None if not found.
 
     Args:
       key_name: key name of entity
+      parent: parent of the entity
     """
 
     if self._id_based:
@@ -211,13 +212,14 @@
     if not key_name:
       raise InvalidArgumentError
 
-    return self._model.get_by_key_name(key_name)
+    return self._model.get_by_key_name(key_name, parent=parent)
 
-  def getFromID(self, id):
+  def getFromID(self, id, parent=None):
     """Returns entity for id or None if not found.
 
     Args:
       id: id of entity
+      parent: parent of the entity
     """
 
     if not self._id_based:
@@ -226,7 +228,7 @@
     if not id:
       raise InvalidArgumentError
 
-    return self._model.get_by_id(id)
+    return self._model.get_by_id(id, parent=parent)
 
   def getFromKeyNameOr404(self, key_name):
     """Like getFromKeyName but expects to find an entity.