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

form manager improvements

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3752 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2010-02-27 10:54:01 +00:00
parent 29e17d5331
commit 945857c650
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
composer/schema/browser/schema.py
View file

@ -119,9 +119,10 @@ class FormManagerView(BaseView):
def update(self): def update(self):
if self.isManageMode: if self.isManageMode:
return True return True
for tpl in self.context.getClientSchemas(): self.context.request.response.redirect(self.firstFormUrl())
self.context.request.response.redirect(absoluteURL(tpl, self.request)) #for tpl in self.context.getClientSchemas():
break # self.context.request.response.redirect(absoluteURL(tpl, self.request))
# break
return False return False
def overview(self, ignoreTemporary=True): def overview(self, ignoreTemporary=True):
@ -137,6 +138,10 @@ class FormManagerView(BaseView):
result.append(data) result.append(data)
return result return result
def firstFormUrl(self):
for tpl in self.context.getClientSchemas():
return absoluteURL(tpl, self.request)
class CheckoutView(BaseView): class CheckoutView(BaseView):

2
composer/schema/field.py
View file

@ -290,6 +290,8 @@ class FileUploadFieldInstance(FieldInstance):
class EmailFieldInstance(FieldInstance): class EmailFieldInstance(FieldInstance):
def validate(self, value, data=None): def validate(self, value, data=None):
if not value and self.context.required:
self.setError('required_missing')
if value and '@' not in value: if value and '@' not in value:
self.setError('invalid_email_address') self.setError('invalid_email_address')

2
composer/schema/interfaces.py
View file

@ -77,6 +77,8 @@ class ISchemaFactory(Interface):
class FieldType(SimpleTerm): class FieldType(SimpleTerm):
hidden = False
def __init__(self, value, token=None, title=None, **kw): def __init__(self, value, token=None, title=None, **kw):
super(FieldType, self).__init__(value, token, title) super(FieldType, self).__init__(value, token, title)
self.name = value self.name = value