My favorites | Sign in
Project Home Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 41 attachment: v2.patch (5.0 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
Index: admin.py
===================================================================
--- admin.py (revision 39)
+++ admin.py (working copy)
@@ -2,8 +2,8 @@
from forum.models import Forum, Thread, Post, Subscription

class ForumAdmin(admin.ModelAdmin):
- list_display = ('title', '_parents_repr')
- list_filter = ('groups',)
+ list_display = ('title', '_parents_repr', 'site')
+ list_filter = ('groups', 'site')
ordering = ['parent', 'title']
prepopulated_fields = {"slug": ("title",)}

Index: views.py
===================================================================
--- views.py (revision 39)
+++ views.py (working copy)
@@ -20,7 +20,7 @@
from forum.forms import CreateThreadForm, ReplyForm

def forums_list(request):
- queryset = Forum.objects.for_groups(request.user.groups.all()).filter(parent__isnull=True)
+ queryset = Forum.on_site.for_groups(request.user.groups.all()).filter(parent__isnull=True)
return object_list( request,
queryset=queryset)

@@ -31,7 +31,7 @@
most recent post.
"""
try:
- f = Forum.objects.for_groups(request.user.groups.all()).select_related().get(slug=slug)
+ f = Forum.on_site.for_groups(request.user.groups.all()).select_related().get(slug=slug)
except Forum.DoesNotExist:
raise Http404

@@ -55,7 +55,7 @@
"""
try:
t = Thread.objects.select_related().get(pk=thread)
- if not Forum.objects.has_access(t.forum, request.user.groups.all()):
+ if not Forum.on_site.has_access(t.forum, request.user.groups.all()):
raise Http404
except Thread.DoesNotExist:
raise Http404
@@ -97,7 +97,7 @@
t = get_object_or_404(Thread, pk=thread)
if t.closed:
return HttpResponseServerError()
- if not Forum.objects.has_access(t.forum, request.user.groups.all()):
+ if not Forum.on_site.has_access(t.forum, request.user.groups.all()):
return HttpResponseForbidden()

if request.method == "POST":
@@ -176,9 +176,9 @@
if not request.user.is_authenticated():
return HttpResponseServerError()

- f = get_object_or_404(Forum, slug=forum)
+ f = get_object_or_404(Forum.on_site, slug=forum)

- if not Forum.objects.has_access(f, request.user.groups.all()):
+ if not Forum.on_site.has_access(f, request.user.groups.all()):
return HttpResponseForbidden()

if request.method == 'POST':
@@ -221,7 +221,7 @@
if not request.user.is_authenticated():
return HttpResponseForbidden(_('Sorry, you need to login.'))

- subs = Subscription.objects.select_related().filter(author=request.user)
+ subs = Subscription.objects.select_related().filter(author=request.user).filter(thread__forum__site__id=settings.SITE_ID)

if request.POST:
# remove the subscriptions that haven't been checked.
Index: managers.py
===================================================================
--- managers.py (revision 39)
+++ managers.py (working copy)
@@ -1,5 +1,6 @@
from django.db import models
from django.db.models import Q
+from django.contrib.sites.managers import CurrentSiteManager

class ForumManager(models.Manager):
def for_groups(self, groups):
@@ -8,4 +9,7 @@
return self.filter(public|user_groups)

def has_access(self, forum, groups):
- return forum in self.for_groups(groups)
\ No newline at end of file
+ return forum in self.for_groups(groups)
+
+class CurrentSiteForumManager(CurrentSiteManager, ForumManager):
+ pass
\ No newline at end of file
Index: models.py
===================================================================
--- models.py (revision 39)
+++ models.py (working copy)
@@ -8,10 +8,11 @@
from django.db import models
import datetime
from django.contrib.auth.models import User, Group
+from django.contrib.sites.models import Site
from django.conf import settings
from django.utils.translation import ugettext_lazy as _

-from forum.managers import ForumManager
+from forum.managers import ForumManager, CurrentSiteForumManager

class Forum(models.Model):
"""
@@ -22,6 +23,7 @@
All of the parent/child recursion code here is borrowed directly from
the Satchmo project: http://www.satchmoproject.com/
"""
+ site = models.ForeignKey(Site)
groups = models.ManyToManyField(Group, blank=True)
title = models.CharField(_("Title"), max_length=100)
slug = models.SlugField(_("Slug"))
@@ -31,6 +33,7 @@
posts = models.IntegerField(_("Posts"), default=0)

objects = ForumManager()
+ on_site = CurrentSiteForumManager()

def _get_forum_latest_post(self):
"""This gets the latest post for the forum"""
Index: feeds.py
===================================================================
--- feeds.py (revision 39)
+++ feeds.py (working copy)
@@ -18,7 +18,7 @@
return None
else:
slug = "/".join(bits)
- return Forum.objects.get(slug__exact=slug)
+ return Forum.on_site.get(slug__exact=slug)

def title(self, obj):
if not hasattr(self, '_site'):
Powered by Google Project Hosting