From 2710fb6c39c984e716324e61a1cb780bf4c1fccb Mon Sep 17 00:00:00 2001 From: Gaetan Delannay Date: Sat, 2 Jun 2012 20:55:25 +0200 Subject: [PATCH] [gen] Bugfix: attribute Field.focus and UserWrapper password management. --- gen/__init__.py | 4 ++-- gen/ui/appy.css | 3 +++ gen/wrappers/UserWrapper.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gen/__init__.py b/gen/__init__.py index f623db2..1f5a05a 100644 --- a/gen/__init__.py +++ b/gen/__init__.py @@ -681,8 +681,8 @@ class Type: layouts['cell'].addCssClasses('noStyle') if self.focus: # We need to make it flashy - layouts['view'].addCssClasses('appyFocus') - layouts['edit'].addCssClasses('appyFocus') + layouts['view'].addCssClasses('focus') + layouts['edit'].addCssClasses('focus') # If layouts are the default ones, set width=None instead of width=100% # for the field if it is not in a group. if areDefault and not self.group: diff --git a/gen/ui/appy.css b/gen/ui/appy.css index 77ef526..be46b44 100644 --- a/gen/ui/appy.css +++ b/gen/ui/appy.css @@ -63,6 +63,9 @@ img { border: 0; vertical-align: middle} width: 600px; border: 1px #F0C36D solid; padding: 6px 16px; background-color: #F9EDBE; text-align: center; border-radius: 2px 2px 2px 2px; box-shadow: 0 2px 4px #A9A9A9;} +.focus { font-size: 90%; padding: 6px 16px; background-color: #d7dee4; + border-radius: 2px 2px 2px 2px; box-shadow: 0 2px 4px #A9A9A9;} +.focus td { padding: 4px 0px 4px 4px } .discreet { font-size: 90%; } .portlet { width: 150px; border-right: 1px solid #5F7983;} .portletContent { margin: 9px; } diff --git a/gen/wrappers/UserWrapper.py b/gen/wrappers/UserWrapper.py index 07c5a58..dd9aac8 100644 --- a/gen/wrappers/UserWrapper.py +++ b/gen/wrappers/UserWrapper.py @@ -110,8 +110,9 @@ class UserWrapper(AbstractWrapper): zopeUser.roles = self.roles # Update the password if the user has entered new ones. rq = self.request - if rq.has_key('password1'): self.setPassword(rq['password1']) - self.password1 = self.password2 = '' + if rq.has_key('password1'): + self.setPassword(rq['password1']) + self.password1 = self.password2 = '' # "self" must be owned by its Zope user. if 'Owner' not in self.o.get_local_roles_for_userid(login): self.o.manage_addLocalRoles(login, ('Owner',))