kallithea Changeset - a1b8bd86c488

Changeset - a1b8bd86c488

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 14 years ago 2012-01-24 19:01:09
marcin@python-works.com

fixes missing email attribute. Bug introduced after applying setters and getter for sqlalchemy

1 file changed with 9 insertions and 0 deletions:

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -51,12 +51,13 @@ from rhodecode.model.caching_query impor @@
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
 class ModelSerializer(json.JSONEncoder):
     """
     Simple Serializer for JSON,
     usage::
@@ @@ -81,12 +82,13 @@ class ModelSerializer(json.JSONEncoder): @@
         if hasattr(obj, '__json__'):
             return obj.__json__()
         else:
             return json.JSONEncoder.default(self, obj)
 class BaseModel(object):
     """Base Model for all classess
     """
     @classmethod
@@ @@ -98,12 +100,16 @@ class BaseModel(object): @@
         """return dict with keys and values corresponding
         to this model data """
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
         # also use __json__() if present to get additional fields
         for k, val in getattr(self, '__json__', lambda: {})().iteritems():
             d[k] = val
         return d
     def get_appstruct(self):
         """return list with keys and values tupples corresponding
         to this model data """
@@ @@ -312,12 +318,15 @@ class User(Base, BaseModel): @@
         try:
             return "<%s('id:%s:%s')>" % (self.__class__.__name__,
                                              self.user_id, self.username)
         except:
             return self.__class__.__name__
     def __json__(self):
         return {'email': self.email}
     @classmethod
     def get_by_username(cls, username, case_insensitive=False):
         if case_insensitive:
             return Session.query(cls).filter(cls.username.ilike(username)).scalar()
         else:
             return Session.query(cls).filter(cls.username == username).scalar()

0 comments (0 inline, 0 general)