--- a/roundup/htmltemplate.py	Thu Jul 25 07:53:44 2002 +0000
+++ b/roundup/htmltemplate.py	Fri Jul 26 08:27:00 2002 +0000
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.104 2002-07-25 07:14:05 richard Exp $
+# $Id: htmltemplate.py,v 1.105 2002-07-26 08:26:59 richard Exp $
 
 __doc__ = """
 Template engine.
@@ -881,7 +881,7 @@
         if d.has_key('permission'):
             l.remove(('permission', d['permission']))
             for value in d['permission'].split(','):
-                if security.hasClassPermission(self.classname, value, userid):
+                if security.hasPermission(value, userid, self.classname):
                     # just passing the permission is OK
                     return self.execute_template(ok)
 
@@ -1049,7 +1049,8 @@
                         old_group = this_group
 
                 # display this node's row
-                w(replace.execute_template(template))
+                self.nodeid = nodeid
+                w(self.execute_template(template))
                 if matches:
                     self.node_matches(matches[nodeid], len(columns))
                 self.nodeid = None
@@ -1417,6 +1418,14 @@
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.104  2002/07/25 07:14:05  richard
+# Bugger it. Here's the current shape of the new security implementation.
+# Still to do:
+#  . call the security funcs from cgi and mailgw
+#  . change shipped templates to include correct initialisation and remove
+#    the old config vars
+# ... that seems like a lot. The bulk of the work has been done though. Honest :)
+#
 # Revision 1.103  2002/07/20 19:29:10  gmcm
 # Fixes/improvements to the search form & saved queries.
 #