diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_event_track/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/website_event_track/data/event_demo.xml | 1 | ||||
| -rw-r--r-- | addons/website_event_track/models/event.py | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/addons/website_event_track/__openerp__.py b/addons/website_event_track/__openerp__.py index b4191655a1f..33faa56fcbb 100644 --- a/addons/website_event_track/__openerp__.py +++ b/addons/website_event_track/__openerp__.py @@ -18,7 +18,7 @@ Adds support for: - agenda - call for proposals """, - 'depends': ['website_event', 'website_blog'], + 'depends': ['website_event'], 'data': [ 'data/event_data.xml', 'views/website_event.xml', diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 1b47766f92e..f8178c9e30c 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -20,7 +20,6 @@ <record id="event.event_0" model="event.event"> <field name="show_tracks">True</field> <field name="show_track_proposal">True</field> - <field name="show_blog">True</field> </record> <!-- Show menu after so that the menu is created with tracks --> diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index d560f36e092..60b7ef1feb1 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -165,10 +165,8 @@ class event_event(models.Model): track_ids = fields.One2many('event.track', 'event_id', 'Tracks') sponsor_ids = fields.One2many('event.sponsor', 'event_id', 'Sponsors') - blog_id = fields.Many2one('blog.blog', 'Event Blog') show_track_proposal = fields.Boolean('Tracks Proposals', compute='_get_show_menu', inverse='_set_show_menu', store=True) show_tracks = fields.Boolean('Show Tracks on Website', compute='_get_show_menu', inverse='_set_show_menu', store=True) - show_blog = fields.Boolean('News') count_tracks = fields.Integer('Tracks', compute='_count_tracks') allowed_track_tag_ids = fields.Many2many('event.track.tag', relation='event_allowed_track_tags_rel', string='Available Track Tags') tracks_tag_ids = fields.Many2many('event.track.tag', relation='event_track_tags_rel', string='Track Tags', compute='_get_tracks_tag_ids', store=True) @@ -180,8 +178,6 @@ class event_event(models.Model): if self.show_tracks: result.append((_('Talks'), '/event/%s/track' % slug(self))) result.append((_('Agenda'), '/event/%s/agenda' % slug(self))) - if self.blog_id: - result.append((_('News'), '/blogpost'+slug(self.blog_ig))) if self.show_track_proposal: result.append((_('Talk Proposals'), '/event/%s/track_proposal' % slug(self))) return result |