[MERGE] upstream

bzr revid: fme@openerp.com-20140114134356-jm3uavch5xejqx9o

addons/website/models/website.py

@@ -624,7 +624,7 @@ class res_company(osv.osv):
         partner = self.browse(cr, openerp.SUPERUSER_ID, ids[0], context=context).partner_id
         return partner and partner.google_map_link(zoom, context=context) or None
 
-class base_language_install(osv.osv):
+class base_language_install(osv.osv_memory):
     _inherit = "base.language.install"
     _columns = {
         'website_ids': fields.many2many('website', string='Websites to translate'),

addons/website_blog/controllers/main.py

@@ -23,6 +23,7 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.addons.website.models import website
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 
 import werkzeug
 
@@ -218,16 +219,23 @@ class WebsiteBlog(http.Controller):
         }
         return request.website.render("website_blog.blog_post_complete", values)
 
-    @website.route(['/blogpost/<int:blog_post_id>/comment'], type='http', auth="public")
-    def blog_post_comment(self, blog_post_id, **post):
+    @website.route(['/blogpost/comment'], type='http', auth="public", methods=['POST'])
+    def blog_post_comment(self, blog_post_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         if post.get('comment'):
-            request.registry['blog.post'].message_post(
-                cr, uid, blog_post_id,
-                body=post.get('comment'),
-                type='comment',
-                subtype='mt_comment',
-                context=dict(context, mail_create_nosubcribe=True))
+            user = request.registry['res.users'].browse(cr, SUPERUSER_ID, uid, context=context)
+            group_ids = user.groups_id
+            group_id = request.registry["ir.model.data"].get_object_reference(cr, uid, 'website_mail', 'group_comment')[1]
+            if group_id in [group.id for group in group_ids]:
+                blog_post = request.registry['blog.post']
+                blog_post.check_access_rights(cr, uid, 'read')
+                blog_post.message_post(
+                    cr, SUPERUSER_ID, int(blog_post_id),
+                    body=post.get('comment'),
+                    type='comment',
+                    subtype='mt_comment',
+                    author_id=user.partner_id.id,
+                    context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
     @website.route('/blogpost/new', type='http', auth="public", multilang=True)

addons/website_blog/views/website_blog_templates.xml

@@ -133,7 +133,7 @@
 <!-- Options: Blog Post Summary: hide author -->
 <template id="opt_blog_post_short_author" name="Author"
         inherit_option_id="website_blog.blog_post_short">
-    <xpath expr="//span[@class*='oe_date']" position="after">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
         <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
     </xpath>
 </template>
@@ -182,7 +182,7 @@
 
     <h1 class="text-center" t-field="blog_post.name"/>
     <p class="post-meta text-muted text-center" name="blog_post_data">
-        <span class="fa fa-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+        <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
         <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o"> With
             <a t-attf-href="#comments">
                 <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
@@ -218,10 +218,10 @@
 <template id="opt_blog_post_complete_comment" name="Allow Comments"
         inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"
         groups="website_mail.group_comment">
-    <xpath expr="//ul[@id='comments-list']" position="after">
+    <xpath expr="//ul[@id='comments-list']" position="before">
         <section class="mb32 css_editable_mode_hidden">
-            <form id="comment" t-attf-action="/blogpost/#{blog_post.id}/comment"
-                    method="POST">
+            <form id="comment" t-attf-action="/blogpost/comment" method="POST">
+                <input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
                 <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
                 <div class="pull-left mb32" style="width: 75%%">
                     <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
@@ -236,7 +236,7 @@
 <!-- Options: Blog Post: hide author -->
 <template id="opt_blog_post_complete_author" name="Authors"
         inherit_option_id="website_blog.blog_post_complete">
-    <xpath expr="//span[@class*='oe_date']" position="after">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
         <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
     </xpath>
 </template>
@@ -244,7 +244,7 @@
 <!-- Options: Blog Post: show category -->
 <template id="opt_blog_post_complete_category" name="Blog Category"
         inherit_option_id="website_blog.blog_post_complete">
-    <xpath expr="//span[@class*='oe_date']" position="after">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
         <span class="fa fa-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
     </xpath>
 </template>

addons/website_mail/static/src/css/website_mail.css

@@ -0,0 +1,4 @@
+.js_follow[data-follow='on'] .js_follow_btn ,
+.js_follow[data-follow='off'] .js_unfollow_btn {
+    display: none;
+}

addons/website_sale/data/website_sale_demo.xml

@@ -536,6 +536,7 @@ Weight: 1.1 ounces</field>
                     </div>
                 </section>
             </field>
+            <field name="suggested_product_ids" eval="[(6, 0, [ref('product.product_template_7')])]"/>
         </record>
 
         <record id="item1" model="product.pricelist.item">

addons/website_sale/views/website_sale.xml

@@ -678,7 +678,7 @@
                       }'/>
                   </td>
                   <td class="text-center">
-                      <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
+                      <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/"><strong>Add to Cart</strong></a>
                   </td>
               </tr>
           </tbody>