Changeset 4634 for waeup/branches/ulif-layout/src

Timestamp:

2 Jan 2010, 14:31:40 (15 years ago)

Author:

uli

Message:

• Remove adduser view and viewlet. Both moved to browser subpackage.

• Make usercontainer accept and set roles, when adding new users.

File:

• waeup/branches/ulif-layout/src/waeup/users.py (modified) (2 diffs)

waeup/branches/ulif-layout/src/waeup/users.py

@@ -17 +17 @@
     grok.require('waeup.manageUsers')
 
-    def addUser(self, name, password, title=None, description=None):
+    def addUser(self, name, password, title=None, description=None, roles=[]):
         if title is None:
             title = name
         if description is None:
             description = title
-        self[name] = Account(name, password, title, description)
+        self[name] = Account(name, password, title, description, roles)
 
     def addAccount(self, account):
@@ -30 +30 @@
         if name in self.keys():
             del self[name]
-
-            
-class AddUserForm(grok.AddForm):
-    grok.require('waeup.manageUsers')
-    grok.context(UserContainer)
-    form_fields = grok.AutoFields(IUserAccount)
-    label = 'Add user'
-
-    @grok.action('Add user')
-    def addFaculty(self, **data):
-        #user = Account(**data)
-        name = data['name']
-        title = data['title']
-        description = data['description']
-        password = data['password']
-        try:
-            self.context.addUser(name, password, title=title,
-                                 description=description)
-        except DuplicationError:
-            self.status = Invalid('The userid chosen already exists '
-                                  'in the database')
-            return
-        self.redirect(self.url(self.context))
-
-class AddUser(FormWrapMixin, grok.Viewlet):
-    """A viewlet that wraps the `AddUserForm`.
-    """
-    grok.viewletmanager(MainArea)
-    grok.context(UserContainer)
-    grok.view(Add)
-    grok.require('waeup.manageUsers')
-
-    formview_name = 'adduserform' # The name of the formview we want
-                                  # to be rendered in this viewlet.