@@ -838,9 +838,9 @@ def list(self, sort_on=None):
838838 if not check ('Web Access' , userid ):
839839 return []
840840
841- class_list = [HTMLItem (self ._client , self ._classname , id )
842- for id in class_list if
843- check ('View' , userid , self ._classname , itemid = id )]
841+ class_list = [HTMLItem (self ._client , self ._classname , itemid )
842+ for itemid in class_list if
843+ check ('View' , userid , self ._classname , itemid = itemid )]
844844
845845 return class_list
846846
@@ -903,9 +903,10 @@ def filter(self, request=None, filterspec={}, sort=[], group=[]):
903903 if not check ('Web Access' , userid ):
904904 return []
905905
906- filtered = [HTMLItem (self ._client , self .classname , id )
907- for id in self ._klass .filter (None , filterspec , sort , group )
908- if check ('View' , userid , self .classname , itemid = id )]
906+ filtered = [HTMLItem (self ._client , self .classname , itemid )
907+ for itemid in self ._klass .filter (None , filterspec ,
908+ sort , group )
909+ if check ('View' , userid , self .classname , itemid = itemid )]
909910 return filtered
910911
911912 def classhelp (self , properties = None , label = '' "(list)" , width = '500' ,
@@ -1700,7 +1701,7 @@ def _hyper_repl(self, match):
17001701 return self ._hyper_repl_email (match , '<a href="mailto:%s">%s</a>' )
17011702 elif len (match .group ('id' )) < 10 :
17021703 return self ._hyper_repl_item (
1703- match , '<a href="%(cls)s%(id )s%(fragment)s">%(item)s</a>' )
1704+ match , '<a href="%(cls)s%(itemid )s%(fragment)s">%(item)s</a>' )
17041705 else :
17051706 # just return the matched text
17061707 return match .group (0 )
@@ -1733,14 +1734,14 @@ def _hyper_repl_email(self, match, replacement):
17331734 def _hyper_repl_item (self , match , replacement ):
17341735 item = match .group ('item' )
17351736 cls = match .group ('class' ).lower ()
1736- id = match .group ('id' )
1737+ itemid = match .group ('id' )
17371738 fragment = match .group ('fragment' )
17381739 if fragment is None :
17391740 fragment = ""
17401741 try :
17411742 # make sure cls is a valid tracker classname
17421743 cl = self ._db .getclass (cls )
1743- if not cl .hasnode (id ):
1744+ if not cl .hasnode (itemid ):
17441745 return item
17451746 return replacement % locals ()
17461747 except KeyError :
@@ -1754,7 +1755,7 @@ def _hyper_repl_rst(self, match):
17541755 s = match .group ('email' )
17551756 return '`%s <mailto:%s>`_' % (s , s )
17561757 elif len (match .group ('id' )) < 10 :
1757- return self ._hyper_repl_item (match , '`%(item)s <%(cls)s%(id )s>`_' )
1758+ return self ._hyper_repl_item (match , '`%(item)s <%(cls)s%(itemid )s>`_' )
17581759 else :
17591760 # just return the matched text
17601761 return match .group (0 )
@@ -1795,7 +1796,7 @@ def _hyper_repl_markdown(self, match):
17951796 if (prefix , suffix ) in {('(' , ')' )}:
17961797 if match .string [start - 1 ] == ']' :
17971798 return match .group (0 )
1798- return self ._hyper_repl_item (match , '[%(item)s](%(cls)s%(id )s)' )
1799+ return self ._hyper_repl_item (match , '[%(item)s](%(cls)s%(itemid )s)' )
17991800 else :
18001801 # just return the matched text
18011802 return match .group (0 )
0 commit comments