@@ -838,9 +838,9 @@ def list(self, sort_on=None):
838
838
if not check ('Web Access' , userid ):
839
839
return []
840
840
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 )]
844
844
845
845
return class_list
846
846
@@ -903,9 +903,10 @@ def filter(self, request=None, filterspec={}, sort=[], group=[]):
903
903
if not check ('Web Access' , userid ):
904
904
return []
905
905
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 )]
909
910
return filtered
910
911
911
912
def classhelp (self , properties = None , label = '' "(list)" , width = '500' ,
@@ -1700,7 +1701,7 @@ def _hyper_repl(self, match):
1700
1701
return self ._hyper_repl_email (match , '<a href="mailto:%s">%s</a>' )
1701
1702
elif len (match .group ('id' )) < 10 :
1702
1703
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>' )
1704
1705
else :
1705
1706
# just return the matched text
1706
1707
return match .group (0 )
@@ -1733,14 +1734,14 @@ def _hyper_repl_email(self, match, replacement):
1733
1734
def _hyper_repl_item (self , match , replacement ):
1734
1735
item = match .group ('item' )
1735
1736
cls = match .group ('class' ).lower ()
1736
- id = match .group ('id' )
1737
+ itemid = match .group ('id' )
1737
1738
fragment = match .group ('fragment' )
1738
1739
if fragment is None :
1739
1740
fragment = ""
1740
1741
try :
1741
1742
# make sure cls is a valid tracker classname
1742
1743
cl = self ._db .getclass (cls )
1743
- if not cl .hasnode (id ):
1744
+ if not cl .hasnode (itemid ):
1744
1745
return item
1745
1746
return replacement % locals ()
1746
1747
except KeyError :
@@ -1754,7 +1755,7 @@ def _hyper_repl_rst(self, match):
1754
1755
s = match .group ('email' )
1755
1756
return '`%s <mailto:%s>`_' % (s , s )
1756
1757
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>`_' )
1758
1759
else :
1759
1760
# just return the matched text
1760
1761
return match .group (0 )
@@ -1795,7 +1796,7 @@ def _hyper_repl_markdown(self, match):
1795
1796
if (prefix , suffix ) in {('(' , ')' )}:
1796
1797
if match .string [start - 1 ] == ']' :
1797
1798
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)' )
1799
1800
else :
1800
1801
# just return the matched text
1801
1802
return match .group (0 )
0 commit comments