[Oi-commits] r520 - trunk/forum

[oi-commits at pardus.org.tr]

Author: ahmet
Date: Wed Aug 22 11:17:41 2007
New Revision: 520

Modified:
   trunk/forum/models.py
   trunk/forum/urls.py
   trunk/forum/views.py
Log:
models

Modified: trunk/forum/models.py
=================================================================
Suppressed!
	Too long (more than 250 lines) diff output suppressed...
Modified: trunk/forum/urls.py
=================================================================
--- trunk/forum/urls.py	(original)
+++ trunk/forum/urls.py	Wed Aug 22 11:17:41 2007
@@ -7,13 +7,22 @@
 
 from django.conf.urls.defaults import patterns
 
-urlpatterns = patterns('oi.forum.views',
-    (r'^feed/rss/$', 'rssfeed'),
-    (r'^feed/atom/$', 'atomfeed'),
-    (r'^feed/$', 'rssfeed'),
+from models import Forum, Category
 
-    (r'^feed/atom/user/(?P<user>\d+)/$', 'atomfeed'),
-    (r'^feed/rss/user/(?P<user>\d+)/$', 'rssfeed'),
+main_dict = {
+             'queryset': Forum.objects.filter(hidden=0).order_by('name'),
+             'template_name': 'forum/main.html',
+             'template_object_name': 'forum',
+             'extra_context': {'categories': Category.objects.filter(hidden=0).order_by('name')}
+            }
 
-    (r'^$', 'main'),
+urlpatterns = patterns('',
+    #(r'^feed/rss/$', 'rssfeed'),
+    #(r'^feed/atom/$', 'atomfeed'),
+    #(r'^feed/$', 'rssfeed'),
+
+    #(r'^feed/atom/user/(?P<user>\d+)/$', 'atomfeed'),
+    #(r'^feed/rss/user/(?P<user>\d+)/$', 'rssfeed'),
+
+    (r'^$', 'django.views.generic.list_detail.object_list', dict(main_dict)),
 )

Modified: trunk/forum/views.py
=================================================================
--- trunk/forum/views.py	(original)
+++ trunk/forum/views.py	Wed Aug 22 11:17:41 2007
@@ -14,15 +14,16 @@
 from django import newforms as forms
 
 from oi.st.wrappers import render_response
-from oi.forum.models import Forum, Thread, Post, Moderator, AbuseReport, WatchList
+from oi.forum.models import Category, Forum, Topic, Post, Moderator, AbuseReport, WatchList
 
 def main(request):
-    return render_response(request, 'forum/main.html')
+    forums = Forum.objects.all()
+    return render_response(request, 'forum/main.html', locals())
 
 def forum(request, slug):
     """
     Displays a list of threads within a forum.
-    Threads are sorted by their sticky flag, followed by their 
+    Topics are sorted by their sticky flag, followed by their 
     most recent post.
     """
     f = get_object_or_404(Forum, slug=slug)
@@ -39,7 +40,7 @@
     posts for that thread, in chronological order.
     """
     f = get_object_or_404(Forum, slug=forum)
-    t = get_object_or_404(Thread, pk=thread)
+    t = get_object_or_404(Topic, pk=thread)
     p = t.post_set.all().order_by('time')
 
     t.views += 1
@@ -61,7 +62,7 @@
         raise HttpResponseServerError
 
     f = get_object_or_404(Forum, slug=forum)
-    t = get_object_or_404(Thread, pk=thread)
+    t = get_object_or_404(Topic, pk=thread)
 
     if t.closed:
         raise HttpResponseServerError
@@ -87,7 +88,7 @@
     if not request.user.is_authenticated:
         raise HttpResponseServerError
     f = get_object_or_404(Forum, slug=forum)
-    t = Thread(
+    t = Topic(
         forum=f,
         title=request.POST.get('title'),
     )