From daf5aed1a3b903cc7c35fcc945c53108f5c403a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Sep 2013 12:35:34 +0200
Subject: [PATCH] [IMP] website_blog: re-enabled navigation

bzr revid: tde@openerp.com-20130923103534-4sbb1gqylekhmbim
---
 addons/website_blog/controllers/main.py       | 23 +++++++++++++++----
 .../static/src/js/website_blog.js             |  3 +--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 090a4bfba4d..737cbb7959c 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -93,10 +93,25 @@ class website_mail(http.Controller):
         print values
         return request.website.render("website_blog.index", values)
 
-    # @website.route(['/blog/nav'], type='http', auth="public")
-    # def nav(self, **post):
-    #     comment_ids = request.registry['mail.group'].get_public_message_ids(request.cr, request.uid, domain=safe_eval(post.get('domain')), order="create_date asc", limit=None, context=request.context)
-    #     return simplejson.dumps(request.registry['mail.message'].read(request.cr, request.uid, comment_ids, ['website_published', 'subject', 'res_id'], request.context))
+    @website.route(['/blog/nav'], type='http', auth="public")
+    def nav(self, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        blog_post_ids = request.registry['blog.post'].search(
+            cr, uid, safe_eval(post.get('domain')),
+            order="create_date asc",
+            limit=None,
+            context=context
+        )
+        blog_post_data = [
+            {
+                'id': blog_post.id,
+                'name': blog_post.name,
+                'website_published': blog_post.website_published,
+                'category_id': blog_post.category_id and blog_post.category_id.id or False,
+            }
+            for blog_post in request.registry['blog.post'].browse(cr, uid, blog_post_ids, context=context)
+        ]
+        return simplejson.dumps(blog_post_data)
 
     @website.route(['/blog/<int:category_id>/<int:blog_post_id>/post'], type='http', auth="public")
     def blog_comment(self, category_id=None, blog_post_id=None, **post):
diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js
index ed39817ca59..511fb9b2822 100644
--- a/addons/website_blog/static/src/js/website_blog.js
+++ b/addons/website_blog/static/src/js/website_blog.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
                 var result = JSON.parse(result);
                 var blog_id = +window.location.pathname.split("/").pop();
                 $(result).each(function () {
-                    var $a = $('<a href="/blog/'+this.res_id+'/'+this.id+'"/>').text(this.subject);
+                    var $a = $('<a href="/blog/' + this.category_id + '/' + this.id + '"/>').text(this.name);
                     var $li = $("<li/>").append($a);
                     if (blog_id == this.id)
                         $li.addClass("active");
@@ -30,7 +30,6 @@ $(document).ready(function () {
     $form = $('.js_website_blog form#comment');
     $form.submit(function (e) {
         e.preventDefault();
-        console.log(e)
         var error = $form.find("textarea").val().length < 3;
         $form.find("textarea").toggleClass("has-error", error);
         if (!error) {