X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/8477d1d3bd27406257f7d1834ed69216440c56bd..55fa8d8e6b6b1562174b12c2658dd463c9b018dc:/Products/Plinn/RegistrationTool.py?ds=sidebyside diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py index 3451d37..fff500e 100644 --- a/Products/Plinn/RegistrationTool.py +++ b/Products/Plinn/RegistrationTool.py @@ -183,7 +183,7 @@ class RegistrationTool(BaseRegistrationTool) : private_collections = portal.get('private_collections') if not private_collections : raise AccessControl_Unauthorized() - return + data = private_collections.data lines = filter(None, [l.strip() for l in data.split('\n')]) assert len(lines) % 3 == 0 @@ -194,7 +194,6 @@ class RegistrationTool(BaseRegistrationTool) : if not (collecInfos.has_key(properties.get('collection_id')) and \ collecInfos[properties.get('collection_id')]['pw'] == properties.get('collection_password')) : raise AccessControl_Unauthorized('Wrong primary credentials') - return BaseRegistrationTool.addMember(self, id, password, roles=roles, @@ -316,7 +315,7 @@ class RegistrationTool(BaseRegistrationTool) : del self._passwordResetRequests[uuid] return userid, _('Password successfully updated.') else : - return None, _('"%s" username not found.') % userid + return None, _('"${userid}" username not found.', mapping={'userid': userid}) else : return None, msg