cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge branch master

Browse source
This commit is contained in:
Helmut Merz 2012-04-25 13:59:06 +02:00
commit f24851fa8b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/action.py
View file

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

2
integrator/README.txt
View file

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

8
organize/member.py
View file

@ -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 # 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 # it under the terms of the GNU General Public License as published by
@ -18,8 +18,6 @@
""" """
Member registration adapter(s). Member registration adapter(s).
$Id$
""" """
from zope import interface, component, schema from zope import interface, component, schema
@ -65,13 +63,15 @@ class MemberRegistrationManager(object):
self.context = context self.context = context
def register(self, userId, password, lastName, firstName=u'', def register(self, userId, password, lastName, firstName=u'',
groups=[], useExisting=False, **kw): groups=[], useExisting=False, pfName=None, **kw):
concepts = self.context.getConceptManager() concepts = self.context.getConceptManager()
personType = adapted(concepts[self.person_typeName]) personType = adapted(concepts[self.person_typeName])
options = IOptions(personType) options = IOptions(personType)
if pfName is None:
pfName = options(self.principalfolder_key, pfName = options(self.principalfolder_key,
(self.default_principalfolder,))[0] (self.default_principalfolder,))[0]
self.createPrincipal(pfName, userId, password, lastName, firstName) self.createPrincipal(pfName, userId, password, lastName, firstName)
if not groups:
groups = options(self.groups_key, ()) groups = options(self.groups_key, ())
self.setGroupsForPrincipal(pfName, userId, groups=groups) self.setGroupsForPrincipal(pfName, userId, groups=groups)
self.createPersonForPrincipal(pfName, userId, lastName, firstName, self.createPersonForPrincipal(pfName, userId, lastName, firstName,