fixed escaping for new webhelpers and added perm2user constraint

pylons_app/model/db.py

@@ -90,7 +90,7 b' class RepoToPerm(Base):'
 
 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)

pylons_app/templates/base/base.html

@@ -83,7 +83,7 b''
 		<% 
 		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">