From: artunit Date: Thu, 20 Nov 2008 00:46:51 +0000 (+0000) Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@31 6d9bc8c9-1ec2-4278... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cd4a92d8564a5e192d8d4f6744372120fa95493e;p=Syrup.git git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@31 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py index e5e8a89..687bee8 100644 --- a/conifer/syrup/models.py +++ b/conifer/syrup/models.py @@ -14,14 +14,6 @@ from datetime import datetime # can be made available on the User that are not part of the Django # User model. Let's try this for a bit see how this works out. -class AnonymousUserExtensionHack(object): - def unmoderated_courses(): - return Course.objects.filter(moderated=False) - -for k,v in [(k,v) for k,v in AnonymousUserExtensionHack.__dict__.items() \ - if not k.startswith('_')]: - setattr(AnonymousUser, k, v) - class UserExtensionHack(object): def courses(self): return Course.objects.filter(member__user=self.id) diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py index 0e59006..f458621 100644 --- a/conifer/syrup/urls.py +++ b/conifer/syrup/urls.py @@ -3,5 +3,6 @@ from django.conf.urls.defaults import * urlpatterns = patterns('conifer.syrup.views', (r'^$', 'welcome'), (r'^course/$', 'my_courses'), + (r'^opencourse/$', 'open_courses'), (r'^course/(?P\d+)/$', 'course_detail'), ) diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index 12d89f8..a432b27 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -1,4 +1,5 @@ from django.http import HttpResponse, HttpResponseRedirect +from django.core.paginator import Paginator from django.shortcuts import get_object_or_404 from django.contrib.auth.decorators import login_required from django.contrib.auth import authenticate, login, logout @@ -32,6 +33,12 @@ def auth_handler(request, path): def welcome(request): return g.render('welcome.xhtml') +def open_courses(request): + pgstart = request.GET.get('start') + if not pgstart: + pgstart = 1 + paginator = Paginator(models.Course.objects.filter(moderated=False), 5) + return g.render('open_courses.xhtml', paginator=paginator, pgstart=pgstart) @login_required def my_courses(request): diff --git a/conifer/templates/welcome.xhtml b/conifer/templates/welcome.xhtml index 77e9188..7486f43 100644 --- a/conifer/templates/welcome.xhtml +++ b/conifer/templates/welcome.xhtml @@ -11,6 +11,7 @@ title = 'Welcome!'

News