diff options
| -rw-r--r-- | pytask/taskapp/urls.py | 4 | ||||
| -rwxr-xr-x | pytask/taskapp/views.py | 22 | ||||
| -rw-r--r-- | pytask/templates/task/browse_textbooks.html | 29 |
3 files changed, 53 insertions, 2 deletions
diff --git a/pytask/taskapp/urls.py b/pytask/taskapp/urls.py index 9fd1013..9fe94db 100644 --- a/pytask/taskapp/urls.py +++ b/pytask/taskapp/urls.py @@ -1,7 +1,8 @@ from django.conf.urls.defaults import * from pytask.taskapp.views import create_task, view_task, claim_task, \ - select_user, edit_task, create_textbook, view_textbook + select_user, edit_task, create_textbook, view_textbook, \ + browse_textbooks from pytask.views import under_construction @@ -16,5 +17,6 @@ urlpatterns = patterns('', (r'^textbook/create/$', create_textbook), (r'^textbook/view/tid=(\w+)/$', view_textbook), + (r'^textbook/browse/$', browse_textbooks), ) diff --git a/pytask/taskapp/views.py b/pytask/taskapp/views.py index 8ac621f..292b4c0 100755 --- a/pytask/taskapp/views.py +++ b/pytask/taskapp/views.py @@ -225,7 +225,7 @@ def view_textbook(request, tid): user = request.user if not user.is_authenticated(): - return render_to_response("task/view_textbook.html") + return render_to_response("task/view_textbook.html", {"user": user}) profile = user.get_profile() @@ -249,6 +249,26 @@ def view_textbook(request, tid): "can_approve": can_approve}) return render_to_response("task/view_textbook.html", context) +def browse_textbooks(request): + + user = request.user + + open_textbooks = TextBook.objects.filter(status="OP").\ + order_by("creation_datetime") + comp_textbooks = TextBook.objects.filter(status="CM").\ + order_by("creation_datetime") + context = {"user": user, + "open_textbooks": open_textbooks, + "comp_textbooks": comp_textbooks, + } + + if user.is_authenticated() and user.get_profile().rights != "CT": + unpub_textbooks = TextBook.objects.filter(status="UP") + + context.update({"unpub_textbooks": unpub_textbooks}) + + return render_to_response("task/browse_textbooks.html", context) + @login_required def claim_task(request, tid): diff --git a/pytask/templates/task/browse_textbooks.html b/pytask/templates/task/browse_textbooks.html new file mode 100644 index 0000000..3d2edd0 --- /dev/null +++ b/pytask/templates/task/browse_textbooks.html @@ -0,0 +1,29 @@ +{% extends 'base.html' %} +{% block content %} + {% if comp_textbooks %} + Textbooks that were completed recently<ul> + {% for textbook in comp_textbooks %} + <li><a href="/task/textbook/view/tid={{ textbook.uniq_key }}">{{ textbook.name }}</a></li> + {% endfor %} + </ul> + <br /> + {% endif %} + + {% if open_textbooks %} + textbooks that are open for contribution<ul> + {% for textbook in comp_textbooks %} + <li><a href="/task/textbook/view/tid={{ textbook.uniq_key }}">{{ textbook.name }}</a></li> + {% endfor %} + </ul> + <br /> + {% endif %} + + {% if unpub_textbooks %} + Textbooks that have been created but need approval<ul> + {% for textbook in unpub_textbooks %} + <li><a href="/task/textbook/view/tid={{ textbook.uniq_key }}">{{ textbook.name }}</a></li> + {% endfor %} + </ul> + <br /> + {% endif %} +{% endblock %} |