# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1282254160 -7200
# Node ID 27f801e03489428fecad773de680e1ec492dfb43
# Parent  0ebec9b88d136f06f16b262f350e09ea9ef729ff
fixed escaping for new webhelpers and added perm2user constraint

diff -r 0ebec9b88d13 -r 27f801e03489 pylons_app/model/db.py
--- 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)
diff -r 0ebec9b88d13 -r 27f801e03489 pylons_app/templates/base/base.html
--- 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">