X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fwebsite_blog%2Fcontrollers%2Fmain.py;h=5f2bea84df68b2f06bbed20cbe8c5c86e5b9f660;hb=b21b32ed2e624896173b6bda9d1f686a57ce58e0;hp=1a0bcf9402e8401c2b08c2fb3477f5891976dcc3;hpb=8f105b6624fc8a9a134aea45a0195e6f180695f8;p=odoo%2Fodoo.git

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 1a0bcf9..5f2bea8 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -51,7 +51,7 @@ class WebsiteBlog(http.Controller):
         blog_post_obj = request.registry['blog.post']
         groups = blog_post_obj.read_group(
             request.cr, request.uid, [], ['name', 'create_date'],
-            groupby="create_date", orderby="create_date asc", context=request.context)
+            groupby="create_date", orderby="create_date desc", context=request.context)
         for group in groups:
             begin_date = datetime.datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
             end_date = datetime.datetime.strptime(group['__domain'][1][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
@@ -62,7 +62,7 @@ class WebsiteBlog(http.Controller):
     @http.route([
         '/blog',
         '/blog/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def blogs(self, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         blog_obj = request.registry['blog.post']
@@ -87,7 +87,7 @@ class WebsiteBlog(http.Controller):
         '/blog/<model("blog.blog"):blog>/page/<int:page>',
         '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>',
         '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/page/<int:page>',
-    ], type='http', auth="public", website=True, multilang=True)
+    ], type='http', auth="public", website=True)
     def blog(self, blog=None, tag=None, page=1, **opt):
         """ Prepare all values to display the blog.
 
@@ -122,7 +122,7 @@ class WebsiteBlog(http.Controller):
         blog_url = QueryURL('', ['blog', 'tag'], blog=blog, tag=tag, date_begin=date_begin, date_end=date_end)
         post_url = QueryURL('', ['blogpost'], tag_id=tag and tag.id or None, date_begin=date_begin, date_end=date_end)
 
-        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date asc", context=context)
+        blog_post_ids = blog_post_obj.search(cr, uid, domain, order="create_date desc", context=context)
         blog_posts = blog_post_obj.browse(cr, uid, blog_post_ids, context=context)
 
         pager = request.website.pager(
@@ -135,9 +135,7 @@ class WebsiteBlog(http.Controller):
         pager_end = page * self._blog_post_per_page
         blog_posts = blog_posts[pager_begin:pager_end]
 
-        tag_obj = request.registry['blog.tag']
-        tag_ids = tag_obj.search(cr, uid, [], context=context)
-        tags = tag_obj.browse(cr, uid, tag_ids, context=context)
+        tags = blog.all_tags()[blog.id]
 
         values = {
             'blog': blog,
@@ -155,8 +153,8 @@ class WebsiteBlog(http.Controller):
         return response
 
     @http.route([
-        '/blog/<model("blog.blog"):blog>/post/<model("blog.post"):blog_post>',
-    ], type='http', auth="public", website=True, multilang=True)
+            '''/blog/<model("blog.blog"):blog>/post/<model("blog.post", "[('blog_id','=',blog[0])]"):blog_post>''',
+    ], type='http', auth="public", website=True)
     def blog_post(self, blog, blog_post, tag_id=None, page=1, enable_editor=None, **post):
         """ Prepare all values to display the blog.
 
@@ -187,7 +185,7 @@ class WebsiteBlog(http.Controller):
         )
         pager_begin = (page - 1) * self._post_comment_per_page
         pager_end = page * self._post_comment_per_page
-        blog_post.website_message_ids = blog_post.website_message_ids[pager_begin:pager_end]
+        comments = blog_post.website_message_ids[pager_begin:pager_end]
 
         tag = None
         if tag_id:
@@ -196,7 +194,7 @@ class WebsiteBlog(http.Controller):
         blog_url = QueryURL('', ['blog', 'tag'], blog=blog_post.blog_id, tag=tag, date_begin=date_begin, date_end=date_end)
 
         if not blog_post.blog_id.id == blog.id:
-            return request.redirect("/blog/%s/post/%s" % (blog_post.blog_id.id, blog_post.id))
+            return request.redirect("/blog/%s/post/%s" % (slug(blog_post.blog_id), slug(blog_post)))
 
         tags = tag_obj.browse(cr, uid, tag_obj.search(cr, uid, [], context=context), context=context)
 
@@ -209,6 +207,8 @@ class WebsiteBlog(http.Controller):
         next_post_id = blog_post_obj.search(cr, uid, [
             ('id', 'not in', visited_ids),
         ], order='ranking desc', limit=1, context=context)
+        if not next_post_id:
+            next_post_id = blog_post_obj.search(cr, uid, [('id', '!=', blog.id)], order='ranking desc', limit=1, context=context)
         next_post = next_post_id and blog_post_obj.browse(cr, uid, next_post_id[0], context=context) or False
 
         values = {
@@ -223,6 +223,8 @@ class WebsiteBlog(http.Controller):
             'date': date_begin,
             'post_url': post_url,
             'blog_url': blog_url,
+            'pager': pager,
+            'comments': comments,
         }
         response = request.website.render("website_blog.blog_post_complete", values)
         response.set_cookie('visited_blogs', ','.join(map(str, visited_ids)))
@@ -240,11 +242,8 @@ class WebsiteBlog(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         blog_post = request.registry['blog.post']
         partner_obj = request.registry['res.partner']
-        thread_obj = request.registry['mail.thread']
-        website = request.registry['website']
 
-        public_id = website.get_public_user(cr, uid, context)
-        if uid != public_id:
+        if uid != request.website.user_id.id:
             partner_ids = [user.partner_id.id]
         else:
             partner_ids = blog_post._find_partner_from_emails(
@@ -259,7 +258,7 @@ class WebsiteBlog(http.Controller):
             subtype='mt_comment',
             author_id=partner_ids[0],
             path=post.get('path', False),
-            context=dict(context, mail_create_nosubcribe=True))
+            context=context)
         return message_id
 
     @http.route(['/blogpost/comment'], type='http', auth="public", methods=['POST'], website=True)
@@ -291,25 +290,25 @@ class WebsiteBlog(http.Controller):
         return values
 
     @http.route(['/blogpost/post_discussion'], type='json', auth="public", website=True)
-    def post_discussion(self, blog_post_id=0, **post):
+    def post_discussion(self, blog_post_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         publish = request.registry['res.users'].has_group(cr, uid, 'base.group_website_publisher')
         user = request.registry['res.users'].browse(cr, uid, uid, context=context)
         id = self._blog_post_message(user, blog_post_id, **post)
         return self._get_discussion_detail([id], publish, **post)
-    
-    @http.route('/blogpost/new', type='http', auth="public", website=True, multilang=True)
+
+    @http.route('/blogpost/new', type='http', auth="public", website=True)
     def blog_post_create(self, blog_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        create_context = dict(context, mail_create_nosubscribe=True)
         new_blog_post_id = request.registry['blog.post'].create(cr, uid, {
-                'blog_id': blog_id,
-                'name': _("Blog Post Title"),
-                'sub_title': _("Subtitle"),
-                'content': '',
-                'website_published': False,
-            }, context=create_context)
-        return werkzeug.utils.redirect("/blog/%s/post/%s/?enable_editor=1" % (blog_id, new_blog_post_id))
+            'blog_id': blog_id,
+            'name': _("Blog Post Title"),
+            'subtitle': _("Subtitle"),
+            'content': '',
+            'website_published': False,
+        }, context=context)
+        new_blog_post = request.registry['blog.post'].browse(cr, uid, new_blog_post_id, context=context)
+        return werkzeug.utils.redirect("/blog/%s/post/%s?enable_editor=1" % (slug(new_blog_post.blog_id), slug(new_blog_post)))
 
     @http.route('/blogpost/duplicate', type='http', auth="public", website=True)
     def blog_post_copy(self, blog_post_id, **post):
@@ -322,8 +321,9 @@ class WebsiteBlog(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         create_context = dict(context, mail_create_nosubscribe=True)
         nid = request.registry['blog.post'].copy(cr, uid, blog_post_id, {}, context=create_context)
+        new_blog_post = request.registry['blog.post'].browse(cr, uid, nid, context=context)
         post = request.registry['blog.post'].browse(cr, uid, nid, context)
-        return werkzeug.utils.redirect("/blog/%s/post/%s/?enable_editor=1" % (post.blog_id.id, nid))
+        return werkzeug.utils.redirect("/blog/%s/post/%s?enable_editor=1" % (slug(post.blog_id), slug(new_blog_post)))
 
     @http.route('/blogpost/get_discussion/', type='json', auth="public", website=True)
     def discussion(self, post_id=0, path=None, count=False, **post):
@@ -339,6 +339,14 @@ class WebsiteBlog(http.Controller):
             return ids
         return self._get_discussion_detail(ids, publish, **post)
 
+    @http.route('/blogpost/get_discussions/', type='json', auth="public", website=True)
+    def discussions(self, post_id=0, paths=None, count=False, **post):
+        ret = []
+        for path in paths:
+            result = self.discussion(post_id=post_id, path=path, count=count, **post)
+            ret.append({"path": path, "val": result})
+        return ret
+
     @http.route('/blogpost/change_background', type='json', auth="public", website=True)
     def change_bg(self, post_id=0, image=None, **post):
         if not post_id: