fixes to make registration work again

Author: Richard Jones

roundup/cgi/actions.py

@@ -840,12 +840,6 @@ def handle(self):
                 % str(message))
             return
 
-        # registration isn't allowed to supply roles
-        user_props = props[('user', None)]
-        if user_props.has_key('roles'):
-            raise exceptions.Unauthorised, self._(
-                "It is not permitted to supply roles at registration.")
-
         # skip the confirmation step?
         if self.db.config['INSTANT_REGISTRATION']:
             # handle the create now
@@ -923,6 +917,17 @@ def handle(self):
         # redirect to the "you're almost there" page
         raise exceptions.Redirect, '%suser?@template=rego_progress'%self.base
 
+    def newItemPermission(self, props, classname=None):
+        """Just check the "Register" permission.
+        """
+        # registration isn't allowed to supply roles
+        if props.has_key('roles'):
+            raise exceptions.Unauthorised, self._(
+                "It is not permitted to supply roles at registration.")
+
+        # technically already checked, but here for clarity
+        return self.hasPermission('Register', classname=classname)
+
 class LogoutAction(Action):
     def handle(self):
         """Make us really anonymous - nuke the session too."""

roundup/cgi/client.py

@@ -738,6 +738,12 @@ def check_anonymous_access(self):
         if action in ('login', 'register'):
             return
 
+        # allow Anonymous to view the "user" "register" template if they're
+        # allowed to register
+        if (self.db.security.hasPermission('Register', self.userid, 'user')
+                and self.classname == 'user' and self.template == 'register'):
+            return
+
         # otherwise for everything else
         if self.user == 'anonymous':
             if not self.db.security.hasPermission('Web Access', self.userid):

roundup/cgi/templating.py

@@ -1304,9 +1304,9 @@ def is_edit_ok(self):
         """
         perm = self._db.security.hasPermission
         userid = self._client.userid
-        if not perm('Web Access', userid):
-            return False
         if self._nodeid:
+            if not perm('Web Access', userid):
+                return False
             return perm('Edit', userid, self._classname, self._name,
                 self._nodeid)
         return perm('Create', userid, self._classname, self._name) or \