merge branch master

browser/action.py

@@ -81,7 +81,7 @@ class DialogAction(Action):
 
     @Lazy
     def onClick(self):
-        urlParams = dict(dialog=self.dialogName)
+        urlParams = dict(dialog=self.dialogName, version='this')
         if self.qualifier:
             urlParams['qualifier'] = self.qualifier
         if self.typeToken:

integrator/README.txt

@@ -231,7 +231,7 @@ Extracting Document Properties from MS Office Files
   >>> path = os.path.join(dataDir, 'office')
   >>> fn = os.path.join(path, 'example.docx')
   >>> os.path.getsize(fn)
-  20337L
+  20337...
 
   >>> officeFile = addAndConfigureObject(resources, Resource, 'test.docx',
   ...                    title=u'Example Word File', resourceType=tOfficeFile,

organize/member.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2009 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@
 
 """
 Member registration adapter(s).
-
-$Id$
 """
 
 from zope import interface, component, schema
@@ -65,13 +63,15 @@ class MemberRegistrationManager(object):
         self.context = context
 
     def register(self, userId, password, lastName, firstName=u'',
-                 groups=[], useExisting=False, **kw):
+                 groups=[], useExisting=False, pfName=None, **kw):
         concepts = self.context.getConceptManager()
         personType = adapted(concepts[self.person_typeName])
         options = IOptions(personType)
+        if pfName is None:
             pfName = options(self.principalfolder_key,
                              (self.default_principalfolder,))[0]
         self.createPrincipal(pfName, userId, password, lastName, firstName)
+        if not groups:
             groups = options(self.groups_key, ())
         self.setGroupsForPrincipal(pfName, userId,  groups=groups)
         self.createPersonForPrincipal(pfName, userId, lastName, firstName,