Mercurial > kallithea
changeset 414:27f801e03489
fixed escaping for new webhelpers and added perm2user constraint
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 19 Aug 2010 23:42:40 +0200 |
| parents | 0ebec9b88d13 |
| children | 04e8b31fb245 |
| files | pylons_app/model/db.py pylons_app/templates/base/base.html |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/model/db.py Thu Aug 19 22:38:00 2010 +0200 +++ b/pylons_app/model/db.py Thu Aug 19 23:42:40 2010 +0200 @@ -90,7 +90,7 @@ class UserToPerm(Base): __tablename__ = 'user_to_perm' - __table_args__ = {'useexisting':True} + __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'useexisting':True}) user_to_perm_id = Column("user_to_perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None)
--- a/pylons_app/templates/base/base.html Thu Aug 19 22:38:00 2010 +0200 +++ b/pylons_app/templates/base/base.html Thu Aug 19 23:42:40 2010 +0200 @@ -83,7 +83,7 @@ <% def is_current(selected): if selected == current: - return "class='current'" + return h.literal('class="current"') %> %if current not in ['home','admin']: <script type="text/javascript">