kallithea Changeset - 27f801e03489

Changeset - 27f801e03489

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-08-19 23:42:40
marcin@python-works.com

fixed escaping for new webhelpers and added perm2user constraint

2 files changed with 2 insertions and 2 deletions:

pylons_app/model/db.py

pylons_app/templates/base/base.html

0 comments (0 inline, 0 general)

pylons_app/model/db.py

➞

Show inline comments

@@ @@ -87,13 +87,13 @@ class RepoToPerm(Base): @@
     user = relation('User')
     permission = relation('Permission')
     repository = relation('Repository')
 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)
     user = relation('User')
     permission = relation('Permission')

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -80,13 +80,13 @@ @@
 </%def>
 <%def name="menu(current=None)">
 		<%
 		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">
             YAHOO.util.Event.onDOMReady(function(){
                 YAHOO.util.Event.addListener('repo_switcher','click',function(){
                     if(YAHOO.util.Dom.hasClass('repo_switcher','selected')){

0 comments (0 inline, 0 general)