diff options
| -rw-r--r-- | chimere/rss/feeds.py | 10 | ||||
| -rw-r--r-- | chimere/rss/templates/rss_descr.html | 2 | ||||
| -rw-r--r-- | chimere/rss/views.py | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/chimere/rss/feeds.py b/chimere/rss/feeds.py index 1bb1a76..01a574e 100644 --- a/chimere/rss/feeds.py +++ b/chimere/rss/feeds.py @@ -77,20 +77,14 @@ class LatestPOIsByCategory(BaseFeed): raise FeedDoesNotExist return settings.BASE_URL + 'rss/category/' + str(obj.id) - def description(self, obj): - """ - Description of the feed - """ - return obj.description - def items(self, obj): """ Requests to marker where its category match the category is requested and its status is available - This returns a list of the 15 last markers/POIs ordering by date + This returns a list of the 15 last markers/POIs ordering by date """ q = Marker.objects.filter(status__exact='A', - categories__subcategory__category__id__exact=obj.id, + categories__category__id__exact=obj.id, available_date__isnull=False).order_by('-available_date')[:15] return q diff --git a/chimere/rss/templates/rss_descr.html b/chimere/rss/templates/rss_descr.html index f94b061..5cd842a 100644 --- a/chimere/rss/templates/rss_descr.html +++ b/chimere/rss/templates/rss_descr.html @@ -1,6 +1,6 @@ {% load i18n %} <div id='detail_content'> -{% if obj.picture %}<img src='{{media_path}}{{obj.picture}}' alt='{{obj.name}}'/>{%endif%} +{% if obj.picture %}<img src='{{obj.picture.url}}' alt="{{obj.name}}"/>{%endif%} <div>{% for property in obj.getProperties %} <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|safe }}</p> {% endfor %}</div> diff --git a/chimere/rss/views.py b/chimere/rss/views.py index 04d69dc..dc35fe5 100644 --- a/chimere/rss/views.py +++ b/chimere/rss/views.py @@ -25,6 +25,7 @@ Views of the project from django.shortcuts import render_to_response from django.http import HttpResponseRedirect +from django.utils.translation import ugettext as _ from chimere import settings from chimere.main.views import get_base_response @@ -72,7 +73,7 @@ def rss(request, area_name=''): else: error = _("Incorrect choice in the list") response_dct.update({'error_message':error, - 'category_rss_feed':'category', + 'category_rss_feed':'', 'sub_categories':SubCategory.getAvailable(['M', 'B'])}) return render_to_response('rss.html', response_dct) |