Skip to content

E
erp5_rtl_support
Commit b6713cc9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

Formulator: prepare DateTimeField's sub_form dynamically. 

otherwise TALES in input_style does not work and changes in the original proxy field will not be reflected.
parent 57ace587
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 63 deletions
product/Formulator/StandardFields.py
View file @ b6713cc9
......@@ -127,60 +127,18 @@ class DateTimeField(ZMIField):
widget = Widget.DateTimeWidgetInstance
validator = Validator.DateTimeValidatorInstance
def __init__(self, id, **kw):
# icky but necessary...
apply(ZMIField.__init__, (self, id), kw)
@property
def sub_form(self):
input_style = self.get_value('input_style')
if input_style == 'text':
self.sub_form = create_datetime_text_sub_form()
return create_datetime_text_sub_form(self)
elif input_style == 'list':
self.sub_form = create_datetime_list_sub_form()
return create_datetime_list_sub_form(self)
elif input_style == 'number':
self.sub_form = create_datetime_number_sub_form()
return create_datetime_number_sub_form(self)
else:
assert 0, "Unknown input_style '%s'" % input_style
def on_value_input_style_changed(self, value):
if value == 'text':
self.sub_form = create_datetime_text_sub_form()
elif value == 'list':
self.sub_form = create_datetime_list_sub_form()
year_field = self.sub_form.get_field('year', include_disabled=1)
year_field.overrides['items'] = BoundMethod(self,
'_override_year_items')
elif value == 'number':
self.sub_form = create_datetime_number_sub_form()
else:
assert 0, "Unknown input_style."
self.on_value_css_class_changed(self.values['css_class'])
def on_value_timezone_style_changed(self, value):
if value:
input_style = self.get_value('input_style')
self.on_value_input_style_changed(input_style)
def on_value_css_class_changed(self, value):
for field in self.sub_form.get_fields():
field.values['css_class'] = value
field._p_changed = 1
def _override_year_items(self):
"""The method gets called to get the right amount of years.
"""
start_datetime = self.get_value('start_datetime')
end_datetime = self.get_value('end_datetime')
current_year = DateTime().year()
if start_datetime:
first_year = start_datetime.year()
else:
first_year = current_year
if end_datetime:
last_year = end_datetime.year() + 1
else:
last_year = first_year + 11
return create_items(first_year, last_year, digits=4)
def _get_user_input_value(self, key, REQUEST):
"""
Try to get a value of the field from the REQUEST
......@@ -188,12 +146,14 @@ class DateTimeField(ZMIField):
if REQUEST.form['subfield_%s_%s' % (key, 'year')]:
return None
def create_datetime_text_sub_form():
def create_datetime_text_sub_form(field):
sub_form = BasicForm()
css_class = field.get_value('css_class')
year = IntegerField('year',
title="Year",
required=0,
css_class=css_class,
display_width=4,
display_maxwidth=4,
max_length=4)
......@@ -201,6 +161,7 @@ def create_datetime_text_sub_form():
month = IntegerField('month',
title="Month",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -208,6 +169,7 @@ def create_datetime_text_sub_form():
day = IntegerField('day',
title="Day",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -217,6 +179,7 @@ def create_datetime_text_sub_form():
hour = IntegerField('hour',
title="Hour",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -224,6 +187,7 @@ def create_datetime_text_sub_form():
minute = IntegerField('minute',
title="Minute",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -231,32 +195,48 @@ def create_datetime_text_sub_form():
ampm = StringField('ampm',
title="am/pm",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
timezone = ListField('timezone',
title = "Timezone",
required = 0,
css_class=css_class,
default = 'GMT',
items = Widget.gmt_timezones,
size = 1)
sub_form.add_fields([hour, minute, ampm, timezone], "time")
return sub_form
def create_datetime_list_sub_form():
def create_datetime_list_sub_form(field):
""" Patch Products.Formulator.StandardFields so we can add timezone subfield """
sub_form = BasicForm()
css_class = field.get_value('css_class')
start_datetime = field.get_value('start_datetime')
end_datetime = field.get_value('end_datetime')
current_year = DateTime().year()
if start_datetime:
first_year = start_datetime.year()
else:
first_year = current_year
if end_datetime:
last_year = end_datetime.year() + 1
else:
last_year = first_year + 11
year = ListField('year',
title="Year",
required=0,
css_class=css_class,
default="",
items=create_items(2000, 2010, digits=4),
items=create_items(first_year, last_year, digits=4),
size=1)
month = ListField('month',
title="Month",
required=0,
css_class=css_class,
default="",
items=create_items(1, 13, digits=2),
size=1)
......@@ -264,6 +244,7 @@ def create_datetime_list_sub_form():
day = ListField('day',
title="Day",
required=0,
css_class=css_class,
default="",
items=create_items(1, 32, digits=2),
size=1)
......@@ -274,6 +255,7 @@ def create_datetime_list_sub_form():
hour = IntegerField('hour',
title="Hour",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -281,6 +263,7 @@ def create_datetime_list_sub_form():
minute = IntegerField('minute',
title="Minute",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
......@@ -288,6 +271,7 @@ def create_datetime_list_sub_form():
ampm = ListField('ampm',
title="am/pm",
required=0,
css_class=css_class,
default="am",
items=[("am","am"),
("pm","pm")],
......@@ -295,6 +279,7 @@ def create_datetime_list_sub_form():
timezone = ListField('timezone',
title = "Timezone",
required = 0,
css_class=css_class,
default = 'GMT',
items = Widget.gmt_timezones,
size = 1)
......@@ -303,14 +288,26 @@ def create_datetime_list_sub_form():
sub_form.add_fields([hour, minute, ampm, timezone], "time")
return sub_form
def create_datetime_number_sub_form():
def create_datetime_number_sub_form(field):
sub_form = BasicForm()
css_class = field.get_value('css_class')
start_datetime = field.get_value('start_datetime')
end_datetime = field.get_value('end_datetime')
if start_datetime:
first_year = start_datetime.year()
else:
first_year = 0
if end_datetime:
last_year = end_datetime.year()
else:
last_year = 9999
year = IntegerField('year',
title="Year",
required=0,
input_type='number',
extra='min="0" max="9999"',
css_class=css_class,
extra='min="%s" max="%s"' % (first_year, last_year),
display_width=4,
display_maxwidth=4,
max_length=4)
......@@ -319,6 +316,7 @@ def create_datetime_number_sub_form():
title="Month",
required=0,
input_type='number',
css_class=css_class,
extra='min="1" max="12"',
display_width=2,
display_maxwidth=2,
......@@ -327,6 +325,7 @@ def create_datetime_number_sub_form():
day = IntegerField('day',
title="Day",
required=0,
css_class=css_class,
input_type='number',
extra='min="1" max="31"',
display_width=2,
......@@ -338,6 +337,7 @@ def create_datetime_number_sub_form():
hour = IntegerField('hour',
title="Hour",
required=0,
css_class=css_class,
input_type='number',
extra='min="0" max="23"',
display_width=2,
......@@ -347,6 +347,7 @@ def create_datetime_number_sub_form():
minute = IntegerField('minute',
title="Minute",
required=0,
css_class=css_class,
input_type='number',
extra='min="0" max="59"',
display_width=2,
......@@ -356,12 +357,14 @@ def create_datetime_number_sub_form():
ampm = StringField('ampm',
title="am/pm",
required=0,
css_class=css_class,
display_width=2,
display_maxwidth=2,
max_length=2)
timezone = ListField('timezone',
title = "Timezone",
required = 0,
css_class=css_class,
default = 'GMT',
items = Widget.gmt_timezones,
size = 1)
......
product/Formulator/Widget.py
View file @ b6713cc9
......@@ -1455,10 +1455,6 @@ class DateTimeWidget(Widget):
def render(self, field, key, value, REQUEST, render_prefix=None):
use_ampm = field.get_value('ampm_time_style')
use_timezone = field.get_value('timezone_style')
# FIXME: backwards compatibility hack:
if not hasattr(field, 'sub_form'):
from StandardFields import create_datetime_text_sub_form
field.sub_form = create_datetime_text_sub_form()
# Is it still usefull to test the None value,
# as DateTimeField should be considerer as the other field
......
product/Formulator/tests/testForm.py
View file @ b6713cc9
# -*- coding: utf-8 -*-
import unittest, re
from DateTime import DateTime
import Zope2
# XXX this does not work for zope2.x if x < 3
......@@ -120,14 +121,10 @@ class FormTestCase(unittest.TestCase):
self.form.manage_addProduct['Formulator']\
.manage_addField('date_time','Test Field','DateTimeField')
field = self.form.date_time
sub_form = field.sub_form
if sub_form.has_field('timezone'):
del sub_form.fields['timezone']
#now timezone is not presented
self.assertFalse(self.form.date_time.sub_form.has_field('timezone'))
field._edit({'timezone_style': 0})
self.assertFalse('<select size="1" name="subfield_field_date_time_timezone" >' in field.render())
field._edit({'timezone_style': 1})
#test if timezone's presented
self.assertTrue(self.form.date_time.sub_form.has_field('timezone'))
self.assertTrue('<select size="1" name="subfield_field_date_time_timezone" >' in field.render())
def test_datetime_css_class_rendering(self):
......@@ -177,6 +174,22 @@ class FormTestCase(unittest.TestCase):
self.assertEqual(0, len(css_matches))
def test_datetime_number_style(self):
# test that a bug is fixed, which causing the css_class value
# not to be rendered
self.form.manage_addProduct['Formulator']\
.manage_addField('date_time','Test Field','DateTimeField')
field = self.form.date_time
field._edit({'input_style': 'number'})
self.assertTrue('<input name="subfield_field_date_time_year" value="" maxlength="4" type="number" size="4" min="0" max="9999" />' in field.render())
field._edit({'start_datetime': DateTime('1900/01/01'), 'end_datetime': None})
self.assertTrue('<input name="subfield_field_date_time_year" value="" maxlength="4" type="number" size="4" min="1900" max="9999" />' in field.render())
field._edit({'start_datetime': None, 'end_datetime': DateTime('2099/12/31')})
self.assertTrue('<input name="subfield_field_date_time_year" value="" maxlength="4" type="number" size="4" min="0" max="2099" />' in field.render())
field._edit({'start_datetime': DateTime('1900/01/01'), 'end_datetime': DateTime('2099/12/31')})
self.assertTrue('<input name="subfield_field_date_time_year" value="" maxlength="4" type="number" size="4" min="1900" max="2099" />' in field.render())
def test_suite():
suite = unittest.TestSuite()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7