diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2013-11-23 22:49:38 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2013-11-23 22:49:38 +0100 |
| commit | e79536f6c9774937cbd8bb2b6ab352fd45e839ea (patch) | |
| tree | 2d72ae6c373481bce5cce603e734e7bc60352651 | |
| parent | 1d0e4515e7e5fe55e6b5ff232d89f6d0da8a1d1b (diff) | |
[IMP] some fixes
bzr revid: fp@tinyerp.com-20131123214938-yozqgcs9x8wzavqx
| -rw-r--r-- | addons/website_event_track/data/event_view.xml | 15 | ||||
| -rw-r--r-- | addons/website_event_track/models/event.py | 3 |
2 files changed, 8 insertions, 10 deletions
diff --git a/addons/website_event_track/data/event_view.xml b/addons/website_event_track/data/event_view.xml index 139d2513452..9aef01cd704 100644 --- a/addons/website_event_track/data/event_view.xml +++ b/addons/website_event_track/data/event_view.xml @@ -4,8 +4,8 @@ <record id="act_event_list_tracks" model="ir.actions.act_window"> <field name="res_model">event.track</field> - <field name="view_type">form</field> <field name="name">Event Tracks</field> + <field name="view_type">form</field> <field name="view_mode">kanban,tree,form,calendar,graph</field> <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field> </record> @@ -193,23 +193,20 @@ <field name="name"/> </h1> <label for="event_id" class="oe_edit_only"/> - <h2> + <h3> <field name="event_id"/> - </h2> - <label for="tag_ids" class="oe_edit_only"/> - <h2> - <field name="tag_ids"/> - </h2> + </h3> </div> <group> <group> <field name="user_id"/> - <field name="speaker_ids"/> + <field name="speaker_ids" widget="many2many_tags"/> <field name="location_id"/> </group> <group> <field name="date"/> - <field name="duration"/> + <field name="duration" widget="float_time"/> + <field name="tag_ids" widget="many2many_tags"/> </group> </group> </sheet> diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index b9be1ae0224..af53fb70b1a 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -58,7 +58,7 @@ class event_track(osv.osv): 'description': fields.html('Track Description'), 'date': fields.datetime('Track Date'), 'duration': fields.float('Duration (Hours)'), - 'location_id': fields.many2one('event.track.location'), + 'location_id': fields.many2one('event.track.location', 'Location'), 'attachment_show': fields.boolean('Show Documents'), 'event_id': fields.many2one('event.event', 'Event', required=True), 'color': fields.integer('Color Index'), @@ -66,6 +66,7 @@ class event_track(osv.osv): _defaults = { 'user_id': lambda self, cr, uid, ctx: uid, 'attachment_show': lambda self, cr, uid, ctx: True, + 'duration': lambda *args: 2 } |