diff options
| -rw-r--r-- | commentingapp/templates/commenting.html | 2 | ||||
| -rw-r--r-- | commentingapp/views.py | 23 | ||||
| -rwxr-xr-x | tbc/views.py | 30 | ||||
| -rw-r--r-- | tbc_error_page/templates/broken.html | 2 | ||||
| -rw-r--r-- | tbc_error_page/templates/error.html | 4 | ||||
| -rw-r--r-- | tbc_error_page/views.py | 32 |
6 files changed, 50 insertions, 43 deletions
diff --git a/commentingapp/templates/commenting.html b/commentingapp/templates/commenting.html index 3e888e6..82c19ed 100644 --- a/commentingapp/templates/commenting.html +++ b/commentingapp/templates/commenting.html @@ -4,7 +4,7 @@ {% block content %} <h3><center> TBC Commenting </center></h3> - <h5> Hi <u> <b>{{user}} </b> </u> </h5><br/> + <h5> Hi <u> <b>{{reviewer.get_full_name}} </b> </u> </h5><br/> <a href = "https://pythontbc.disqus.com" target = "blank">Go to Disqus admin Page </a> {% if not url_context %} diff --git a/commentingapp/views.py b/commentingapp/views.py index f2a0f36..66606b7 100644 --- a/commentingapp/views.py +++ b/commentingapp/views.py @@ -1,27 +1,26 @@ from django.shortcuts import render, render_to_response from django.contrib.auth.decorators import login_required -from django.template import RequestContext +from django.core.context_processors import csrf from .models import Url, Comments -from django.contrib.auth.decorators import user_passes_test from django.db.models import Q -from django.contrib.auth.models import User from collections import Counter -import os.path -from email.mime.text import MIMEText from django.http import Http404 from tbc.models import Book, Chapters from tbc.views import is_reviewer -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login/") + +@login_required(login_url="/login/") def commenting(request): - ci = RequestContext(request) + context = {} + context.update(csrf(request)) curr_user = request.user if not is_reviewer(curr_user): raise Http404("You are not allowed to view this page") else: url_instance = Url.objects.filter(Q(comments__is_notified = 0)).distinct() - context = {"url_context": url_instance, "user": curr_user} + context["url_context"] = url_instance + context["reviewer"] = curr_user if request.method == "POST": notified_comment_list = request.POST.getlist("comment") @@ -37,10 +36,10 @@ def commenting(request): status = url_db_instance.send_mail_to_contributor(contributor_details) if status == True: - context = {"notified_comments": "You have suceesfully notified the contributors"} + context["notified_comments"] = "You have suceesfully notified the contributors" else: - context = {"notified_comments": "Mail couldnot be sent"} - return render_to_response("notified.html", context, ci) + context["notified_comments"] = "Mail could not be sent" + return render_to_response("notified.html", context) - return render_to_response ("commenting.html", context, ci) + return render_to_response ("commenting.html", context) diff --git a/tbc/views.py b/tbc/views.py index 18e2d4d..e866c46 100755 --- a/tbc/views.py +++ b/tbc/views.py @@ -1189,7 +1189,6 @@ def BrowseBooks(request): return render_to_response('tbc/browse-books.html', context) - def ConvertNotebook(request, notebook_path=None): """ Checks for the modified time of ipython notebooks and corresponding html page and replaces html page with new one if corresponding ipython notebook has been modified. """ @@ -1198,16 +1197,23 @@ def ConvertNotebook(request, notebook_path=None): path = os.path.join(local.path, notebook_path.strip(".ipynb")) template_html = path+".html" template_ipynb =path+".ipynb" - modified_time_for_html = os.stat(template_html).st_mtime - modified_time_for_ipynb = os.stat(template_ipynb).st_mtime + template_dir = os.path.dirname(path) + + def nbconvert(template_ipynb): + notebook_convert = "ipython nbconvert --to html {0} --FilesWriter.build_directory={1}".format(template_ipynb, template_dir) + subprocess.call (notebook_convert, shell = True) - if os.path.isfile(template_html) and modified_time_for_html > modified_time_for_ipynb: - return render_to_response(template_html, {}) - else: - notebook_convert = "ipython nbconvert --to html %s" % str(template_ipynb) - subprocess.call (notebook_convert) - return render_to_response(template_html, {}) + if os.path.isfile(template_html): + modified_time_for_html = os.stat(template_html).st_mtime + modified_time_for_ipynb = os.stat(template_ipynb).st_mtime + if not modified_time_for_html > modified_time_for_ipynb: + nbconvert(template_ipynb) + + else: + nbconvert(template_ipynb) + + return render_to_response(template_html, context) def CompletedBooks(request): @@ -1415,7 +1421,7 @@ def link_image(request): context['success'] = True return render_to_response('tbc/link_image.html', context, context_instance=ci) -@login_required( login_url= "/admin") +@login_required(login_url="/login/") def admin_tools(request): ci = RequestContext(request) curr_user = request.user @@ -1423,5 +1429,5 @@ def admin_tools(request): if not is_reviewer(curr_user): raise Http404("You are not allowed to view this page") else: - context = {"user":curr_user} - return render_to_response('tbc/admin-tools.html', context, context_instance=ci) + context = {"reviewer":curr_user} + return render_to_response('tbc/admin-tools.html', context, ci) diff --git a/tbc_error_page/templates/broken.html b/tbc_error_page/templates/broken.html index 841069c..9c49785 100644 --- a/tbc_error_page/templates/broken.html +++ b/tbc_error_page/templates/broken.html @@ -5,7 +5,7 @@ <center><h4> There are no new comments </h4></center> {% else %} <h3><u><center>TBC Broken Links Page </center></u></h3> - <h5> Hi <b><u> {{user}} </b><u> </h5> + <h5> Hi <b><u> {{reviewer.get_full_name}} </b><u> </h5> <a href = "{% url 'tbc_error_page.views.error' %}"> TBC Error Status Page </a> <p></p> <table border = 1> diff --git a/tbc_error_page/templates/error.html b/tbc_error_page/templates/error.html index 237c7f3..057820e 100644 --- a/tbc_error_page/templates/error.html +++ b/tbc_error_page/templates/error.html @@ -6,8 +6,8 @@ {% block content %} <body> - <h3><u><center>TBC Error Page </center></u></h3> - <h5> Hi <b><u>{{ user }} </b></u></h5> + <h3><u><center>TBC Error Page </center></u></h3> + <h5> Hi <b><u> {{reviewer.get_full_name}} </b><u> </h5> <p><a href = "{% url 'tbc_error_page.views.broken' %}"> TBC Broken Links page </a></p> {% if not context %} <center><h4> There are no new errors </h4></center> diff --git a/tbc_error_page/views.py b/tbc_error_page/views.py index 099f996..d788afa 100644 --- a/tbc_error_page/views.py +++ b/tbc_error_page/views.py @@ -1,16 +1,15 @@ from django.shortcuts import render_to_response from .models import Error, Broken, get_json_from_file -from django.contrib.auth.decorators import user_passes_test -from django.template import RequestContext +from django.contrib.auth.decorators import login_required +from django.core.context_processors import csrf from django.http import Http404 -import json -import os from tbc.views import is_reviewer -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login") +@login_required(login_url="/login/") def error(request): - ci = RequestContext(request) + context = {} + context.update(csrf(request)) curr_user = request.user if not is_reviewer(curr_user): raise Http404("You are not allowed to view this page") @@ -30,17 +29,19 @@ def error(request): deliberate_urls_list = request.POST.getlist("deliberate") db_instance.update_deliberate_error(deliberate_urls_list) - context = {"user":request.user, "deliberate" :deliberate_urls_list} + context["reviewer"] = request.user + context["deliberate"] = deliberate_urls_list - return render_to_response ("deliberate.html", context, ci) + return render_to_response ("deliberate.html", context) + context["context"] = error_details + context[ "reviewer"] = curr_user + return render_to_response ("error.html", context) - context = {"context": error_details, "user": curr_user} - return render_to_response ("error.html", context, ci) - -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login") +@login_required(login_url="/login/") def broken(request): - ci = RequestContext(request) + context = {} + context.update(csrf(request)) curr_user = request.user if not is_reviewer(curr_user): raise Http404("You are not allowed to view this page") @@ -56,7 +57,8 @@ def broken(request): db_instance.update_broken_data(broken_json_data) broken = Broken.objects.all() - context = {"broken": broken, "user": curr_user} - return render_to_response("broken.html", context, ci) + context["broken"] = broken + context[ "reviewer"] = curr_user + return render_to_response("broken.html", context) |