diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2013-11-23 22:29:28 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2013-11-23 22:29:28 +0100 |
| commit | 1d0e4515e7e5fe55e6b5ff232d89f6d0da8a1d1b (patch) | |
| tree | a52eee181eeba9b79c10b6d59a173da2755283fa /addons | |
| parent | 9d2cb4e0ec14b799021595a82169692cd5f4f4e3 (diff) | |
[FIX] misc fixes
bzr revid: fp@tinyerp.com-20131123212928-m7ppyl46nny8w0vd
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_event_track/data/event_view.xml | 5 | ||||
| -rw-r--r-- | addons/website_event_track/models/event.py | 6 | ||||
| -rw-r--r-- | addons/website_event_track/security/event.xml | 17 |
3 files changed, 23 insertions, 5 deletions
diff --git a/addons/website_event_track/data/event_view.xml b/addons/website_event_track/data/event_view.xml index 26e05a5f399..139d2513452 100644 --- a/addons/website_event_track/data/event_view.xml +++ b/addons/website_event_track/data/event_view.xml @@ -92,13 +92,14 @@ <!-- Events Organisation/CONFIGURATION/EVENTS --> - <record model="ir.ui.view" id="view_event_track_form"> + <record model="ir.ui.view" id="view_event_form"> <field name="name">Event Tracks</field> <field name="inherit_id" ref="event.view_event_form"/> <field name="model">event.event</field> <field name="arch" type="xml"> <xpath expr="//div[@class='oe_title']" position="inside"> - <field name="tag_ids"/> + <label for="tag_ids" class="oe_edit_only"/> + <field name="tag_ids" widget="many2many_tags"/> </xpath> <xpath expr="//div[@class='oe_right oe_button_box']" position="inside"> <button name="%(website_event_track.act_event_list_tracks)d" type="action" string="Tracks"/> diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index bdac23521bf..b9be1ae0224 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -52,8 +52,8 @@ class event_track(osv.osv): _columns = { 'name': fields.char('Track Title', required=True), 'user_id': fields.many2one('res.users', 'Responsible'), - 'speaker_ids': fields.many2many('res.partner', 'Speakers'), - 'tag_ids': fields.many2many('event.tag', 'Tags'), + 'speaker_ids': fields.many2many('res.partner', string='Speakers'), + 'tag_ids': fields.many2many('event.tag', string='Tags'), 'stage_id': fields.many2one('event.track.stage'), 'description': fields.html('Track Description'), 'date': fields.datetime('Track Date'), @@ -76,7 +76,7 @@ class event_track(osv.osv): class event_event(osv.osv): _inherit = "event.event" _columns = { - 'tag_ids': fields.many2many('event.tag', 'Tags'), + 'tag_ids': fields.many2many('event.tag', string='Tags'), 'track_ids': fields.one2many('event.track', 'event_id', 'Tracks'), 'blog_id': fields.many2one('blog.category', 'Event Blog'), } diff --git a/addons/website_event_track/security/event.xml b/addons/website_event_track/security/event.xml new file mode 100644 index 00000000000..1aa62809cd4 --- /dev/null +++ b/addons/website_event_track/security/event.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + + <record id="event_track_public" model="ir.rule"> + <field name="name">event tracks: Public</field> + <field name="model_id" ref="website_event_track.model_event_track"/> + <field name="domain_force">[('website_published', '=', True)]</field> + <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/> + <field name="perm_read" eval="True"/> + <field name="perm_write" eval="False"/> + <field name="perm_create" eval="False"/> + <field name="perm_unlink" eval="False"/> + </record> + + </data> +</openerp> |