[FIX] website_sale: get_website_sale_domain overited in website_event

bzr revid: chm@openerp.com-20131128095142-3ez3vaiht8ppr4oh

diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 23c87af..1af045b 100644 (file)
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -805,7 +805,7 @@
                     </ul>
                 </li>
                 <li><a style="background: none; padding: 5px; border-top: 1px solid #ddd;"></a></li>
-                <li class="oe_custom_bg" data-class="oe_img_bg"><a><b>Choose a photo...</b></a></li>
+                <li class="oe_custom_bg" data-class="oe_img_bg"><a><b>Choose an image...</b></a></li>
             </ul>
         </li>
     </div>

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 51fdb17..6724fb2 100644 (file)
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -25,7 +25,6 @@ from openerp.addons.web.http import request
 from openerp.tools.translate import _
 from openerp.addons.website.models import website
 from openerp.addons.website.controllers.main import Website as controllers
-from openerp.addons.website_sale.controllers.main import Ecommerce as Ecommerce
 controllers = controllers()
 
 
@@ -34,9 +33,6 @@ from dateutil.relativedelta import relativedelta
 from openerp import tools
 import urllib
 
-# remove product event from the website content grid and list view (not removed in detail view)
-# Ecommerce.domain += [('event_ok', '=', False)]  # this is not correct, install only ecommerce, this crashes
-
 class website_event(http.Controller):
     @website.route(['/event/', '/event/page/<int:page>'], type='http', auth="public", multilang=True)
     def events(self, page=1, **searches):

diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py
index b968e83..8c2dc59 100644 (file)
--- a/addons/website_event/models/event.py
+++ b/addons/website_event/models/event.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import orm, osv, fields
 from openerp import SUPERUSER_ID
 
 from openerp.tools.translate import _
@@ -139,3 +139,11 @@ class sale_order_line(osv.osv):
             res.update({'price_unit': order_line.event_ticket_id.price})
 
         return res
+
+
+class Website(orm.Model):
+    _inherit = 'website'
+
+    def get_website_sale_domain(self):
+        # remove product event from the website content grid and list view (not removed in detail view)
+        return super(Website, self).get_website_sale_domain() + [('event_ok', '=', False)]
\ No newline at end of file

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 4139e22..23a36e1 100644 (file)
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -43,7 +43,6 @@ class CheckoutInfo(object):
 class Ecommerce(http.Controller):
 
     _order = 'website_sequence desc, website_published desc'
-    domain = [("sale_ok", "=", True)]
 
     def get_attribute_ids(self):
         attributes_obj = request.registry.get('product.attribute')
@@ -281,7 +280,7 @@ class Ecommerce(http.Controller):
             self.change_pricelist(post.get('promo'))
         product_obj = request.registry.get('product.template')
 
-        domain = list(self.domain)
+        domain = request.registry.get('website').get_website_sale_domain()
 
         # remove product_product_consultant from ecommerce editable mode, this product never be publish
         ref = request.registry.get('ir.model.data').get_object_reference(request.cr, SUPERUSER_ID, 'product', 'product_product_consultant')

diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 3d2d1b3..7fa1d7c 100644 (file)
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -122,3 +122,7 @@ class Website(orm.Model):
             order.write(values)
             for line in order.order_line:
                 self.add_product_to_cart(order_line_id=line.id, number=0)
+
+
+    def get_website_sale_domain(self):
+        return [("sale_ok", "=", True)]
\ No newline at end of file