From 62ed52d7972a73133ce44c4d28331a4ba25524a4 Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Thu, 13 Nov 2014 19:25:02 +0100 Subject: [PATCH] Fix bugs: * Can't create categories and tags * Recursively create directories --- ChangeLog | 5 +++- dynastie/generators/index.py | 2 +- dynastie/sites/blog.soutade.fr/_base.html | 9 ++++--- .../sites/blog.soutade.fr/_base_post.html | 9 ++++--- dynastie/sites/blog.soutade.fr/_ljdc.xml | 24 +++++++++++++++++++ dynastie/templates/add_category.html | 2 +- dynastie/templates/category.html | 2 +- dynastie/views.py | 10 ++++---- 8 files changed, 48 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48c0817..d13b3f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.3 (05/06/2014) +v0.3 (13/11/2014) ** User ** Add draft support @@ -9,9 +9,12 @@ v0.3 (05/06/2014) ** Dev ** Add FileOutputCache : md5 cache in database avoiding disk read operation + Do things in a more python way ** Bugs ** Posts set to non published were not removed during re generation + Can't create categories and tags + Recursively create directories v0.2 (27/04/2014) diff --git a/dynastie/generators/index.py b/dynastie/generators/index.py index 34f1291..24ae16a 100755 --- a/dynastie/generators/index.py +++ b/dynastie/generators/index.py @@ -446,7 +446,7 @@ class Index(DynastieGenerator): return None if directory and not os.path.exists(output + '/' + directory): - os.mkdir(output + '/' + directory) + os.makedirs(output + '/' + directory) if not parsePostsTag: return dom diff --git a/dynastie/sites/blog.soutade.fr/_base.html b/dynastie/sites/blog.soutade.fr/_base.html index fc768b5..2bf5924 100755 --- a/dynastie/sites/blog.soutade.fr/_base.html +++ b/dynastie/sites/blog.soutade.fr/_base.html @@ -51,9 +51,11 @@
Catégories
@@ -62,11 +64,12 @@
Tags
diff --git a/dynastie/sites/blog.soutade.fr/_base_post.html b/dynastie/sites/blog.soutade.fr/_base_post.html index e262102..e0d38ef 100644 --- a/dynastie/sites/blog.soutade.fr/_base_post.html +++ b/dynastie/sites/blog.soutade.fr/_base_post.html @@ -52,9 +52,11 @@
Catégories
@@ -63,11 +65,12 @@
Tags
diff --git a/dynastie/sites/blog.soutade.fr/_ljdc.xml b/dynastie/sites/blog.soutade.fr/_ljdc.xml index de87207..ab9b99b 100644 --- a/dynastie/sites/blog.soutade.fr/_ljdc.xml +++ b/dynastie/sites/blog.soutade.fr/_ljdc.xml @@ -1,5 +1,29 @@ + + 102456707903 +
http://thecodinglove.com/post/102456707903/switching-frameworks-just-because-a-feature-sounded
+ switching frameworks just because a feature sounded cool + http://tclhost.com/2mYDrjH.gif + + + 101328062138 +
http://thecodinglove.com/post/101328062138/when-a-colleague-hands-me-his-keyboard-to-help-him-fix
+ When a colleague hands me his keyboard to help him fix a bug + http://tclhost.com/dRUGycW.gif + + + 100159105239 +
http://thecodinglove.com/post/100159105239/developer-vs-designer
+ Developer vs designer + http://tclhost.com/jPOgeEh.gif + + + 98957550324 +
http://lesjoiesducode.fr/post/98957550324/quand-je-guette-larrivee-dune-developpeuse-qui-vient
+ Quand je guette l'arrivée d'une développeuse qui vient passer un entretien + http://ljdchost.com/WS8cDDf.gif + 94165641267
http://thecodinglove.com/post/94165641267/when-the-boss-is-not-around-on-friday-night
diff --git a/dynastie/templates/add_category.html b/dynastie/templates/add_category.html index 946f92b..4c14488 100755 --- a/dynastie/templates/add_category.html +++ b/dynastie/templates/add_category.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -
{% csrf_token %} +{% csrf_token %} {{ form.as_p }} diff --git a/dynastie/templates/category.html b/dynastie/templates/category.html index b170652..6e69783 100755 --- a/dynastie/templates/category.html +++ b/dynastie/templates/category.html @@ -11,5 +11,5 @@ {% endfor %} {% endif %} -
  • Add a category
    • +
  • Add a category
    • {% endblock %} diff --git a/dynastie/views.py b/dynastie/views.py index 08c03f9..8681ca1 100755 --- a/dynastie/views.py +++ b/dynastie/views.py @@ -207,7 +207,7 @@ def add_category(request, blog_id): if request.method == 'POST': if 'add' in request.POST: form = CategoryForm(request.POST) - form.blog = b + form.instance.blog = b if form.is_valid(): form = form.save() return HttpResponseRedirect('/category/' + str(b.id)) @@ -216,7 +216,7 @@ def add_category(request, blog_id): else: form = CategoryForm() - return render(request, 'add_category.html', {'form': form}) + return render(request, 'add_category.html', {'form': form, 'blog' : b}) @login_required def edit_category(request, category_id): @@ -356,7 +356,7 @@ def view_blog(request, blog_id): else: drafts = [] - count = orig_posts.count() - drafts.count() + count = len(orig_posts) - len(drafts) nb_pages = int(count/50) # Prevent error injection @@ -366,7 +366,7 @@ def view_blog(request, blog_id): request.session['cur_page'] = cur_page start = cur_page * 50 - end = start + 50 + drafts.count() + end = start + 50 + len(drafts) orig_posts = orig_posts.order_by('-creation_date')[start:end] @@ -628,7 +628,7 @@ def _generate(request, blog_id, report): b,_ = have_I_right(request, blog_id) posts = Post.objects.filter(blog=b).order_by('-creation_date') - nb_pages = int(posts.count()/50) + nb_pages = int(len(posts)/50) posts = posts[0:50] b = Blog.objects.get(pk=blog_id) form = BlogForm(instance=b)