Merge lp:~gmb/frabjous/multiple-site-support-bug-401638 into lp:frabjous

[Graham Binns]

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'demo-project/settings.py'
--- demo-project/settings.py	2009-07-19 13:07:39 +0000
+++ demo-project/settings.py	2010-01-31 17:47:11 +0000
@@ -107,3 +107,6 @@
     'frabjous.search',
     'frabjous.tokens',
 )
+
+PINGBACK_TITLE = ''
+PINGBACK_SOURCE_URL =''
 
=== modified file 'frabjous/blog/admin.py'
--- frabjous/blog/admin.py	2009-07-19 13:07:39 +0000
+++ frabjous/blog/admin.py	2010-01-31 17:47:11 +0000
@@ -44,6 +44,7 @@
                 'subject',
                 'body',
                 'categories',
+                'sites',
                 'published',
                 'comments_enabled',
                 'author',
 
=== modified file 'frabjous/blog/models.py'
--- frabjous/blog/models.py	2009-07-19 13:07:39 +0000
+++ frabjous/blog/models.py	2010-01-31 17:47:11 +0000
@@ -87,8 +87,13 @@
         # We can get our list of posts using the q now...
         return self.filter(q).distinct()
 
-    def get_displayable_posts(self):
-        results = self.filter(published=True)
+    def get_displayable_posts(self, sites=None):
+        """Return the displayable posts."""
+        if sites is None:
+            sites = Site.objects.get_current()
+
+        results = self.filter(
+            published=True, sites=sites)
         return results
 
     def get_most_recent(self, number=5):
@@ -108,7 +113,7 @@
     body = models.TextField()
     categories = models.ManyToManyField(Category, blank=True)
     comments_enabled = models.BooleanField(default=True)
-    excerpt = models.TextField(null=True,  blank=True)
+    excerpt = models.TextField(null=True, blank=True)
     date_modified = models.DateTimeField(
         auto_now=True, null=True, blank=True)
     date_posted = models.DateTimeField(default=datetime.now)
@@ -121,9 +126,10 @@
     published = models.BooleanField(default=False)
     rpc_servers_pinged = models.ManyToManyField(RPCPingServer, blank=True)
     slug = models.SlugField(
-        unique_for_date='date_posted',
-        max_length=100)
+        unique_for_date='date_posted', max_length=100)
     subject = models.CharField(max_length=255, null=True, blank=True)
+    sites = models.ManyToManyField(
+        Site, related_name='posts', default=str(settings.SITE_ID))
 
     @property
     def comments(self):
@@ -205,8 +211,8 @@
 
     def get_permalink(self):
         """Return the permalink for the Post, including the Site domain."""
-        return 'http://%s%s' % (Site.objects.get_current().domain,
-                                self.get_absolute_url())
+        return 'http://%s%s' % (
+            Site.objects.get_current().domain, self.get_absolute_url())
 
     def __unicode__(self):
         return self.subject
@@ -217,14 +223,14 @@
 
         struct = {
             'title': self.subject,
-            'link': "http://%s%s" % (Site.objects.get_current().domain,
-                                     self.get_absolute_url()),
+            'link': "http://%s%s" % (
+                Site.objects.get_current().domain, self.get_absolute_url()),
             'description': self.body,
             'author': self.author.email,
-            'comments': "http://%s%s" % (Site.objects.get_current().domain,
-                                         self.get_absolute_url()),
-            'guid': "http://%s%s" % (Site.objects.get_current().domain,
-                                     self.get_absolute_url()),
+            'comments': "http://%s%s" % (
+                Site.objects.get_current().domain, self.get_absolute_url()),
+            'guid': "http://%s%s" % (
+                Site.objects.get_current().domain, self.get_absolute_url()),
             'pubDate': self.date_posted.strftime("%Y-%m-%d %H:%M:%S"),
             'category': categories,
             'postid': self.id,