From: Marek Stępniowski Date: Sat, 13 Sep 2008 07:14:13 +0000 (+0200) Subject: Added help text for empty shelves. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/04474c1980a751d4b6ca205e47b82e6471028e7f?ds=inline;hp=-c Added help text for empty shelves. --- 04474c1980a751d4b6ca205e47b82e6471028e7f diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 56df88f99..ade37e52a 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -103,10 +103,11 @@ def tagged_object_list(request, tags=''): raise Http404 model = models.Book + shelf_is_set = any(tag.category == 'set' for tag in tags) theme_is_set = any(tag.category == 'theme' for tag in tags) if theme_is_set: model = models.Fragment - + extra_where = 'NOT catalogue_tag.category = "set"' related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]}) categories = split_tags(related_tags) @@ -117,7 +118,7 @@ def tagged_object_list(request, tags=''): queryset_or_model=model, tags=tags, template_name='catalogue/tagged_object_list.html', - extra_context = {'categories': categories }, + extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set }, ) diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html index 12db8ed89..aef6ad5c3 100644 --- a/wolnelektury/templates/catalogue/tagged_object_list.html +++ b/wolnelektury/templates/catalogue/tagged_object_list.html @@ -55,6 +55,12 @@

{% title_from_tags tags %}

{% breadcrumbs tags %} + {% if shelf_is_set and not object_list %} +
+

Twoja półka jest pusta

+

Możesz wrzucić książkę na półkę, wchodząc na stronę danej lektury i klikając na przycisk „Na półkę!”.

+
+ {% else %} {% autopaginate object_list 10 %}
{% with tags|last as last_tag %} @@ -99,6 +105,7 @@
+ {% endif %}