Mercurial > kallithea
changeset 232:37a832dc4a82
some beaker cache changes, and added repr to models
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 27 May 2010 16:00:47 +0200 |
| parents | a7b0814267cb |
| children | 08e0347351d0 |
| files | development.ini production.ini pylons_app/controllers/summary.py pylons_app/model/db.py |
| diffstat | 4 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Thu May 27 01:20:30 2010 +0200 +++ b/development.ini Thu May 27 16:00:47 2010 +0200 @@ -47,8 +47,8 @@ beaker.cache.data_dir=/tmp/cache/data beaker.cache.lock_dir=/tmp/cache/lock beaker.cache.regions=short_term,long_term -beaker.cache.long_term.type=file -beaker.cache.long_term.expire=3600 +beaker.cache.long_term.type=memory +beaker.cache.long_term.expire=36000 beaker.cache.short_term.type=memory beaker.cache.short_term.expire=60
--- a/production.ini Thu May 27 01:20:30 2010 +0200 +++ b/production.ini Thu May 27 16:00:47 2010 +0200 @@ -47,8 +47,8 @@ beaker.cache.data_dir=/tmp/cache/data beaker.cache.lock_dir=/tmp/cache/lock beaker.cache.regions=short_term,long_term -beaker.cache.long_term.type=file -beaker.cache.long_term.expire=3600 +beaker.cache.long_term.type=memory +beaker.cache.long_term.expire=36000 beaker.cache.short_term.type=memory beaker.cache.short_term.expire=60
--- a/pylons_app/controllers/summary.py Thu May 27 01:20:30 2010 +0200 +++ b/pylons_app/controllers/summary.py Thu May 27 16:00:47 2010 +0200 @@ -1,13 +1,9 @@ -from pylons import tmpl_context as c, app_globals as g, session, request, config, \ - url -from pylons.controllers.util import abort, redirect +from pylons import tmpl_context as c, request from pylons_app.lib.auth import LoginRequired -from pylons_app.lib.base import BaseController, render -from pylons_app.lib.utils import get_repo_slug +from pylons_app.lib.base import BaseController, render, _full_changelog_cached from pylons_app.model.hg_model import HgModel import logging - log = logging.getLogger(__name__) class SummaryController(BaseController): @@ -19,16 +15,14 @@ def index(self): hg_model = HgModel() c.repo_info = hg_model.get_repo(c.repo_name) - c.repo_changesets = c.repo_info.get_changesets(10) + c.repo_changesets = _full_changelog_cached(c.repo_name)[:10] e = request.environ - #BUG: protocol doesnt show https uri = u'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % { - 'protocol': e.get('wsgi.url_scheme'), - 'user':str(c.hg_app_user.username), - 'host':e.get('HTTP_HOST'), - 'repo_name':c.repo_name, - } + 'protocol': e.get('wsgi.url_scheme'), + 'user':str(c.hg_app_user.username), + 'host':e.get('HTTP_HOST'), + 'repo_name':c.repo_name, } c.clone_repo_url = uri c.repo_tags = c.repo_info.tags[:10] c.repo_branches = c.repo_info.branches[:10]
--- a/pylons_app/model/db.py Thu May 27 01:20:30 2010 +0200 +++ b/pylons_app/model/db.py Thu May 27 16:00:47 2010 +0200 @@ -16,6 +16,9 @@ last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None) user_log = relation('UserLogs') + + def __repr__(self): + return "<User('%s:%s')>" % (self.user_id, self.username) class UserLogs(Base): __tablename__ = 'user_logs' @@ -34,3 +37,6 @@ __table_args__ = {'useexisting':True} permission_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + + def __repr__(self): + return "<Permission('%s:%s')>" % (self.permission_id, self.permission_name)