diff options
| author | hardythe1 | 2014-06-17 12:59:34 +0530 |
|---|---|---|
| committer | hardythe1 | 2014-06-17 12:59:34 +0530 |
| commit | 810be42c862956cf4d8bf0bd03b3e8f172c87798 (patch) | |
| tree | f50449e0998357ec54125816de8f06bed5d7d48e /tbc | |
| parent | 634c19bb9308e328802fd1c85b08aa6dcea2ac7a (diff) | |
| download | Python-TBC-Interface-810be42c862956cf4d8bf0bd03b3e8f172c87798.tar.gz Python-TBC-Interface-810be42c862956cf4d8bf0bd03b3e8f172c87798.tar.bz2 Python-TBC-Interface-810be42c862956cf4d8bf0bd03b3e8f172c87798.zip | |
resolving conflict
Diffstat (limited to 'tbc')
| -rwxr-xr-x | tbc/views.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/tbc/views.py b/tbc/views.py index 3dfb82d..2e57632 100755 --- a/tbc/views.py +++ b/tbc/views.py @@ -141,10 +141,7 @@ def UserLogin(request): def UserRegister(request): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= ->>>>>>> temporary_master if request.method == 'POST': form = UserRegisterForm(request.POST) if form.is_valid(): @@ -239,11 +236,8 @@ def ForgotPassword(request): def UpdatePassword(request): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= user = request.user ->>>>>>> temporary_master context.update(csrf(request)) if user.is_authenticated(): if request.method == 'POST': @@ -280,11 +274,8 @@ def UpdatePassword(request): def SubmitBook(request): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= curr_user = request.user ->>>>>>> temporary_master if request.method == 'POST': form = BookForm(request.POST) if form.is_valid(): @@ -312,10 +303,7 @@ def SubmitBook(request): def UpdateBook(request): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= ->>>>>>> temporary_master current_user = request.user user_profile = Profile.objects.get(user=current_user) try: @@ -357,10 +345,7 @@ def UpdateBook(request): def ContentUpload(request, book_id=None): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= ->>>>>>> temporary_master user = request.user curr_book = Book.objects.get(id=book_id) if request.method == 'POST': @@ -400,10 +385,7 @@ def ContentUpload(request, book_id=None): def UpdateContent(request, book_id=None): context = {} -<<<<<<< HEAD return render_to_response('tbc/unavailable.html', context) -======= ->>>>>>> temporary_master user = request.user current_book = Book.objects.get(id=book_id) chapters_to_update = Chapters.objects.filter(book=current_book) |