fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix
[wolnelektury.git]
/
apps
/
catalogue
/
views.py
diff --git
a/apps/catalogue/views.py
b/apps/catalogue/views.py
index
d9ae442
..
d74ca75
100644
(file)
--- a/
apps/catalogue/views.py
+++ b/
apps/catalogue/views.py
@@
-164,7
+164,7
@@
def tagged_object_list(request, tags=''):
objects = fragments
else:
# get relevant books and their tags
objects = fragments
else:
# get relevant books and their tags
- objects = models.Book.tagged.with_all(tags)
.order_by()
+ objects = models.Book.tagged.with_all(tags)
if not shelf_is_set:
# eliminate descendants
l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
if not shelf_is_set:
# eliminate descendants
l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
@@
-262,6
+262,8
@@
def book_stub_detail(request, slug):
def book_text(request, slug):
book = get_object_or_404(models.Book, slug=slug)
def book_text(request, slug):
book = get_object_or_404(models.Book, slug=slug)
+ if not book.has_html_file():
+ raise Http404
book_themes = {}
for fragment in book.fragments.all():
for theme in fragment.tags.filter(category='theme'):
book_themes = {}
for fragment in book.fragments.all():
for theme in fragment.tags.filter(category='theme'):
@@
-324,7
+326,7
@@
def _sqlite_word_starts_with(name, prefix):
return Q(**kwargs)
return Q(**kwargs)
-if settings.DATABASE
_ENGINE == '
sqlite3':
+if settings.DATABASE
S['default']['ENGINE'] == 'django.db.backends.
sqlite3':
_word_starts_with = _sqlite_word_starts_with
_word_starts_with = _sqlite_word_starts_with