pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] don't crash on empty dates [IMP] default dates on demo tracks

Browse Source 
bzr revid: fp@tinyerp.com-20131222230021-9a03x3eiwi4e780x
This commit is contained in:
Fabien Pinckaers
2013-12-23 00:00:21 +01:00
parent 0851024ede
commit ba2689e70c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/models/ir_qweb.py
+5 -3
View File
@@ -159,14 +159,16 @@ class DateTime(orm.AbstractModel):
if isinstance(value, basestring):
value = datetime.datetime.strptime(
value, DEFAULT_SERVER_DATETIME_FORMAT)
value = column.context_timestamp(
cr, uid, timestamp=value, context=context)
if value:
value = column.context_timestamp(
cr, uid, timestamp=value, context=context)
value = value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT)
attrs = super(DateTime, self).attributes(
cr, uid, field_name, record, options, source_element, g_att, t_att,
qweb_context, context=None)
return itertools.chain(attrs, [
('data-oe-original', value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT))
('data-oe-original', value)
])
def from_html(self, cr, uid, model, column, element, context=None):
addons/website_event_track/data/event_demo.xml
+3 -3
View File
@@ -86,7 +86,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="website_published" eval="True"/>
<field name="duration" eval="60"/>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')" name="date_begin"/>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 10:00:00')" name="date"/>
<field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_4')])]"/>
<field name="location_id" ref="website_event_track.event_track_location2"/>
<field name="stage_id" ref="website_event_track.event_track_stage3"/>
@@ -117,7 +117,7 @@
<field name="website_published" eval="True"/>
<field name="duration" eval="60"/>
<field name="priority">1</field>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 11:00:00')" name="date_begin"/>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 11:00:00')" name="date"/>
<field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_13')])]"/>
<field name="location_id" ref="website_event_track.event_track_location2"/>
<field name="stage_id" ref="website_event_track.event_track_stage3"/>
@@ -164,7 +164,7 @@
<field name="website_published" eval="True"/>
<field name="duration" eval="40"/>
<field name="priority">0</field>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
<field eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date"/>
<field name="speaker_ids" eval="[(6, 0, [ref('base.res_partner_address_16')])]"/>
<field name="location_id" ref="website_event_track.event_track_location1"/>
<field name="stage_id" ref="website_event_track.event_track_stage4"/>