fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media in api fix
[wolnelektury.git]
/
apps
/
api
/
handlers.py
diff --git
a/apps/api/handlers.py
b/apps/api/handlers.py
index
32a3ce3
..
508659e
100644
(file)
--- a/
apps/api/handlers.py
+++ b/
apps/api/handlers.py
@@
-135,11
+135,23
@@
class BooksHandler(BaseHandler):
tags = read_tags(tags, allowed=self.categories)
if tags:
if top_level:
tags = read_tags(tags, allowed=self.categories)
if tags:
if top_level:
- return Book.tagged_top_level(tags)
+ books = Book.tagged_top_level(tags)
+ return books if books else rc.NOT_FOUND
else:
else:
-
return
Book.tagged.with_all(tags)
+
books =
Book.tagged.with_all(tags)
else:
else:
- return Book.objects.all()
+ books = Book.objects.all()
+
+ if books.exists():
+ return books
+ else:
+ return rc.NOT_FOUND
+
+ @classmethod
+ def media(self, book):
+ """ Returns all media for a book. """
+
+ return book.media.all()
# add categorized tags fields for Book
# add categorized tags fields for Book
@@
-201,7
+213,13
@@
class TagsHandler(BaseHandler):
except KeyError, e:
return rc.NOT_FOUND
except KeyError, e:
return rc.NOT_FOUND
- return Tag.objects.filter(category=category_sng)
+ tags = Tag.objects.filter(category=category_sng)
+ tags = [t for t in tags if t.get_count() > 0]
+ if tags:
+ return tags
+ else:
+ return rc.NOT_FOUND
+
@classmethod
def href(cls, tag):
@classmethod
def href(cls, tag):
@@
-240,7
+258,11
@@
class FragmentsHandler(BaseHandler):
"""
tags = read_tags(tags, allowed=self.categories)
"""
tags = read_tags(tags, allowed=self.categories)
- return Fragment.tagged.with_all(tags).select_related('book')
+ fragments = Fragment.tagged.with_all(tags).select_related('book')
+ if fragments.exists():
+ return fragments
+ else:
+ return rc.NOT_FOUND
@classmethod
def href(cls, fragment):
@classmethod
def href(cls, fragment):