[IMP] website_sale + website_event: set order, first items = published

bzr revid: chm@openerp.com-20130926141935-1y8ts0y0n1i5tpun

addons/website_event/controllers/main.py

@@ -34,6 +34,7 @@ import werkzeug
 
 
 class website_event(http.Controller):
+    _order = 'website_published desc, date_begin desc'
 
     @website.route(['/event/', '/event/page/<int:page>/'], type='http', auth="public")
     def events(self, page=1, **searches):
@@ -132,7 +133,7 @@ class website_event(http.Controller):
         pager = request.website.pager(url="/event/", total=event_count, page=page, step=step, scope=5)
         obj_ids = event_obj.search(
             request.cr, request.uid, dom_without("none"), limit=step,
-            offset=pager['offset'], order="date_begin DESC", context=request.context)
+            offset=pager['offset'], order=self._order, context=request.context)
         events_ids = event_obj.browse(request.cr, request.uid, obj_ids,
                                       context=request.context)
 

addons/website_event/event.py

@@ -45,6 +45,9 @@ class event(osv.osv):
             help="Website communication history",
         ),
     }
+    _defaults = {
+        'website_published': False,
+    }
 
     def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
         partner = self.browse(cr, uid, ids[0], context=context)

addons/website_sale/controllers/main.py

@@ -49,7 +49,7 @@ class Website(osv.osv):
 
 class Ecommerce(http.Controller):
 
-    _order = 'website_sequence desc, website_published'
+    _order = 'website_sequence desc, website_published desc'
 
     def get_categories(self):
         domain = [('parent_id', '=', False)]

addons/website_sale/product.py

@@ -31,7 +31,7 @@ class product_pricelist(osv.Model):
 
 class product_template(osv.Model):
     _inherit = "product.template"
-    _order = 'website_published,name'
+    _order = 'website_sequence desc, website_published, name'
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'website_description': fields.html('Description for the website'),
@@ -42,6 +42,7 @@ class product_template(osv.Model):
     }
     _defaults = {
         'website_sequence': 1,
+        'website_published': False,
     }
 
     def set_sequence_top(self, cr, uid, ids, context=None):