From a2d100783bd06918eeaaa8a793019f2f0461ec46 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 22 Dec 2013 17:47:11 +0100 Subject: [PATCH] [IMP] Tracks bzr revid: fp@tinyerp.com-20131222164711-hwlqosx7gbd60rf8 --- .../website_event_track/controllers/event.py | 6 - .../website_event_track/data/event_demo.xml | 74 +++++++++++- addons/website_event_track/models/event.py | 2 +- .../views/event_backend.xml | 2 +- .../views/website_event.xml | 114 ++++++++---------- 5 files changed, 126 insertions(+), 72 deletions(-) diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index dad04cb6d29..0da067fc733 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -69,12 +69,6 @@ class website_event(http.Controller): } return request.website.render("website_event_track.tracks", values) - @website.route(['/event/detail/'], type='http', auth="public", multilang=True) - def event_detail(self, event, **post): - website.preload_records(event, on_error="website_event.404") - values = { 'event': event, 'main_object': event } - return request.website.render("website_event_track.event_home", values) - @website.route(['/event//track_proposal/'], type='http', auth="public", multilang=True) def event_track_proposal(self, event, **post): website.preload_records(event, on_error="website_event.404") diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 3b4690a08e6..a7fa71d5978 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -86,8 +86,43 @@ - 2014-12-01 10:00:00 - + + + + + + +
+
+
+
+

A Better Future With OpenERP Commerce

+

by Georges Lucas, OpenCorp Director

+
+
+

+ Apart from being an enterprise management software, OpenERP is + used nowadays for a great variety of enterprise frontends. +

+ The talk illustrates the impact of OpenERP in areas such as the + company website, online events management, eCommerce, online + recruitments, social media marketing, etc. +

+
+
+
+
+
+ + + + How To Drive Sales With OpenERP CRM + + + + 1 + + @@ -109,6 +144,41 @@ recruitments, social media marketing, etc.

+ + + +
+
+ + + Social Marketing As a Source of Leads + + + + 0 + + + + + + +
+
+
+
+

Social Marketing As a Source of Leads

+

by Georges Lucas, OpenCorp Director

+
+
+

+ Apart from being an enterprise management software, OpenERP is + used nowadays for a great variety of enterprise frontends. +

+ The talk illustrates the impact of OpenERP in areas such as the + company website, online events management, eCommerce, online + recruitments, social media marketing, etc. +

+

About The Author

diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index d6895b3c70f..75dd3e8588b 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -58,7 +58,7 @@ class event_track_location(osv.osv): class event_track(osv.osv): _name = "event.track" - _order = 'date' + _order = 'priority, date' _inherit = ['mail.thread', 'ir.needaction_mixin', 'website.seo.metadata'] def _website_url(self, cr, uid, ids, field_name, arg, context=None): diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index b2f31cf5459..5ef9401f00c 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -314,7 +314,7 @@

- minutes + minutes
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index 9790a5d5652..3d162ad7d41 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -2,39 +2,6 @@ - -