diff options
| author | Jayaram Pai | 2013-12-14 23:11:05 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2013-12-14 23:11:05 +0530 |
| commit | 2ce6bbcb687055a0de41e5a2c3615ee41700b54e (patch) | |
| tree | 365d0cc37fd3755ad2af66d046b1dde168912add | |
| parent | 8c6a2d21da4d90e54215bc0044325dab2b7ca143 (diff) | |
| parent | b9102b56140db8ad81b2b4e3d1dfb99c6bebb3ab (diff) | |
| download | Python-TBC-Interface-2ce6bbcb687055a0de41e5a2c3615ee41700b54e.tar.gz Python-TBC-Interface-2ce6bbcb687055a0de41e5a2c3615ee41700b54e.tar.bz2 Python-TBC-Interface-2ce6bbcb687055a0de41e5a2c3615ee41700b54e.zip | |
fix merge conflict
| -rw-r--r-- | tbc/templates/tbc/book-details.html | 4 | ||||
| -rw-r--r-- | tbc/templates/tbc/book-review-details.html | 2 | ||||
| -rw-r--r-- | tbc/views.py | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/tbc/templates/tbc/book-details.html b/tbc/templates/tbc/book-details.html index c2780d4..8887142 100644 --- a/tbc/templates/tbc/book-details.html +++ b/tbc/templates/tbc/book-details.html @@ -17,6 +17,7 @@ <th>#</th> <th>Chapters</th> {% for chapter in chapters %} +<<<<<<< HEAD <tr> <td> {{ forloop.counter }} @@ -25,6 +26,9 @@ <a href="https://nbviewer.ipython.org/url/dev.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a> </td> </tr> +======= + <li><a href="http://nbviewer.ipython.org/url/tbc-python.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a> +>>>>>>> b9102b56140db8ad81b2b4e3d1dfb99c6bebb3ab {% endfor %} </table> <hr> diff --git a/tbc/templates/tbc/book-review-details.html b/tbc/templates/tbc/book-review-details.html index 5ea3f5b..6c4fbd0 100644 --- a/tbc/templates/tbc/book-review-details.html +++ b/tbc/templates/tbc/book-review-details.html @@ -13,7 +13,7 @@ <hr> <ol> {% for chapter in chapters %} - <li><a href="https://nbviewer.ipython.org/url/dev.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a> + <li><a href="http://nbviewer.ipython.org/url/tbc-python.fossee.in{% static 'uploads/' %}{{ chapter.notebook }}">{{ chapter.name }}</a> {% endfor %} </ol> <hr> diff --git a/tbc/views.py b/tbc/views.py index 2556e1f..0a5dbf5 100644 --- a/tbc/views.py +++ b/tbc/views.py @@ -51,6 +51,8 @@ def Home(request): context['logout'] = True if 'update_book' in request.GET: context['update_book'] = True + if 'not_found' in request.GET: + context['not_found'] = True books = Book.objects.filter(approved=True)[0:6] for book in books: images.append(ScreenShots.objects.filter(book=book)[0]) @@ -169,7 +171,10 @@ def SubmitBook(request): def UpdateBook(request): current_user = request.user user_profile = Profile.objects.get(user=current_user) - book_to_update = Book.objects.get(contributor=user_profile, approved=False) + try: + book_to_update = Book.objects.get(contributor=user_profile, approved=False) or None + except: + return HttpResponseRedirect("/?not_found=True") title = book_to_update.title chapters = Chapters.objects.filter(book=book_to_update) screenshots = ScreenShots.objects.filter(book=book_to_update) |