kallithea Changeset - 8530c3cd9d04

Changeset - 8530c3cd9d04

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2012-02-21 19:09:18
marcin@python-works.com

fixed issue with hybrid property for ldap_active
- some small fixes for cache_keys functions

1 file changed with 16 insertions and 3 deletions:

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -162,13 +162,13 @@ class RhodeCodeSetting(Base, BaseModel): @@
         assert type(val) == unicode
         return val
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
-        if v == 'ldap_active':
+        if self.app_settings_name == 'ldap_active':
             v = str2bool(v)
         return v
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
@@ @@ -443,12 +443,13 @@ class UsersGroupMember(Base, BaseModel): @@
     users_group = relationship('UsersGroup')
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         UniqueConstraint('repo_name'),
         {'extend_existing': True},
+    )
@@ @@ -1024,12 +1025,25 @@ class CacheInvalidation(Base, BaseModel) @@
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.cache_id, self.cache_key)
     @classmethod
     def _get_key(cls, key):
         """
         Wrapper for generating a key
         :param key:
         """
         return "%s" % (key)
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.cache_key == key).scalar()
     @classmethod
     def invalidate(cls, key):
         """
         Returns Invalidation object if this given key should be invalidated
         None otherwise. `cache_active = False` means that this cache
         state is not valid and needs to be invalidated
@@ @@ -1068,14 +1082,13 @@ class CacheInvalidation(Base, BaseModel) @@
     def set_valid(cls, key):
         """
         Mark this cache key as active and currently cached
         :param key:
         """
         inv_obj = CacheInvalidation.query()\
             .filter(CacheInvalidation.cache_key == key).scalar()
         inv_obj = cls.get_by_key(key)
         inv_obj.cache_active = True
         Session.add(inv_obj)
         Session.commit()
 class ChangesetComment(Base, BaseModel):

0 comments (0 inline, 0 general)