implemented multilink changes (and a unit test)

[roundup.git] / roundup / cgi_client.py

diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py
index b1ce70cf7fd31ca4112a71a8c5fce6cc8779ee8a..1f1c02dd35b21eb939bb0ee7e2f8267a61dcfa9d 100644 (file)
--- a/roundup/cgi_client.py
+++ b/roundup/cgi_client.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.158 2002-08-15 00:40:10 richard Exp $
+# $Id: cgi_client.py,v 1.162 2002-08-23 04:42:30 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -41,8 +41,9 @@ def initialiseSecurity(security):
     '''
     security.addPermission(name="Web Registration",
         description="User may register through the web")
-    security.addPermission(name="Web Access",
+    p = security.addPermission(name="Web Access",
         description="User may access the web interface")
+    security.addPermissionToRole('Admin', p)
 
     # doing Role stuff through the web - make sure Admin can
     p = security.addPermission(name="Web Roles",
@@ -567,11 +568,12 @@ function help_window(helpurl, width, height) {
             
         self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
             'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
-        
+
         index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn)
         try:
-            index.render(filterspec, search_text, filter, columns, sort, 
-                group, show_customization=show_customization, 
+            index.render(filterspec=filterspec, search_text=search_text,
+                filter=filter, columns=columns, sort=sort, group=group,
+                show_customization=show_customization, 
                 show_nodes=show_nodes, pagesize=pagesize, startwith=startwith,
                 simple_search=simpleform)
         except htmltemplate.MissingTemplateError:
@@ -1423,7 +1425,7 @@ function help_window(helpurl, width, height) {
         self.login()
 
     def opendb(self, user):
-        ''' Open the database - but include the definition of the sessions db.
+        ''' Open the database.
         '''
         # open the db if the user has changed
         if not hasattr(self, 'db') or user != self.db.journaltag:
@@ -1745,6 +1747,18 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.161  2002/08/19 00:21:10  richard
+# removed debug prints
+#
+# Revision 1.160  2002/08/19 00:20:34  richard
+# grant web access to admin ;)
+#
+# Revision 1.159  2002/08/16 04:29:41  richard
+# bugfix
+#
+# Revision 1.158  2002/08/15 00:40:10  richard
+# cleanup
+#
 # Revision 1.157  2002/08/13 20:16:09  gmcm
 # Use a real parser for templates.
 # Rewrite htmltemplate to use the parser (hack, hack).