Zmiana adresu URL z aktualnościami i konwertowanie adresu z unicode do str w tagu...

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 3c34e8c..d3f608a 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+import feedparser
+import datetime
+

 from django import template
 from django.template import Node, Variable
 from django.utils.encoding import smart_str
 from django import template
 from django.template import Node, Variable
 from django.utils.encoding import smart_str


@@ -190,12 +193,9 @@ class CatalogueURLNode(Node):
 
 
 @register.inclusion_tag('catalogue/latest_blog_posts.html')
 
 
 @register.inclusion_tag('catalogue/latest_blog_posts.html')

-def latest_blog_posts(feed_url, posts_to_show=5):
-    import feedparser
-    import datetime
-    
+def latest_blog_posts(feed_url, posts_to_show=5):    

     try:
     try:

-        feed = feedparser.parse(feed_url)
+        feed = feedparser.parse(str(feed_url))

         posts = []
         for i in range(posts_to_show):
             pub_date = feed['entries'][i].updated_parsed
         posts = []
         for i in range(posts_to_show):
             pub_date = feed['entries'][i].updated_parsed

diff --git a/wolnelektury/templates/catalogue/main_page.html b/wolnelektury/templates/catalogue/main_page.html
index 43a3636..af48f84 100644 (file)
--- a/wolnelektury/templates/catalogue/main_page.html
+++ b/wolnelektury/templates/catalogue/main_page.html
@@ -253,7 +253,7 @@
         <div id="latest-blog-posts">
             <h2>Aktualności</h2>
             {% cache 1800 latest-blog-posts %}
         <div id="latest-blog-posts">
             <h2>Aktualności</h2>
             {% cache 1800 latest-blog-posts %}

-            {% latest_blog_posts "http://www.nowoczesnapolska.org.pl/feed/?s=Wolne%20Lektury" %}
+            {% latest_blog_posts "http://www.nowoczesnapolska.org.pl/tematy/wolne-lektury/feed/" %}

             {% endcache %}
             <p class="see-more"><a href="http://www.nowoczesnapolska.org.pl/">Zobacz nasz blog ⇒</a></p>
         </div>
             {% endcache %}
             <p class="see-more"><a href="http://www.nowoczesnapolska.org.pl/">Zobacz nasz blog ⇒</a></p>
         </div>