Add field to make it possible to exclude a blog from the toplists, used

for special blogs that aren't personal, such as site-feeds.

diff --git a/generator.py b/generator.py
index 7b9ff1e9e201d2b23715ed2dd2fffd888aaacfc3..999497cc433e23aa674a8a3d36eb7a60765f0a32 100755 (executable)
--- a/generator.py
+++ b/generator.py
@@ -87,7 +87,9 @@ class Generator:
 SELECT planet.feeds.name,blogurl,feedurl,count(*),planet.teams.name,planet.teams.teamurl,NULL FROM planet.feeds
 INNER JOIN planet.posts ON planet.feeds.id=planet.posts.feed
 LEFT JOIN planet.teams ON planet.teams.id=planet.feeds.team
-WHERE age(dat) < '1 month' AND approved AND NOT hidden GROUP BY planet.feeds.name,blogurl,feedurl,planet.teams.name,teamurl ORDER BY 4 DESC,1 LIMIT 20
+WHERE age(dat) < '1 month' AND approved AND NOT hidden
+AND NOT excludestats
+GROUP BY planet.feeds.name,blogurl,feedurl,planet.teams.name,teamurl ORDER BY 4 DESC,1 LIMIT 20
 """)
 
                self.topposters = [PlanetFeed(feed) for feed in c.fetchall()]
@@ -98,7 +100,9 @@ SELECT NULL,NULL,NULL,NULL,planet.teams.name, teamurl, count(*) FROM
 planet.feeds
 INNER JOIN planet.posts ON planet.feeds.id=planet.posts.feed
 INNER JOIN planet.teams ON planet.teams.id=planet.feeds.team
-WHERE age(dat) < '1 month' AND approved AND NOT hidden GROUP BY planet.teams.name, teamurl ORDER BY 7 DESC, 1 LIMIT 10""")
+WHERE age(dat) < '1 month' AND approved AND NOT hidden
+AND NOT excludestats
+GROUP BY planet.teams.name, teamurl ORDER BY 7 DESC, 1 LIMIT 10""")
 
                self.topteams = [PlanetFeed(feed) for feed in c.fetchall()]
                if len(self.topteams) < 2: self.topteams = []

diff --git a/hamnadmin/register/models.py b/hamnadmin/register/models.py
index f3042cf13376c181cde3c4223b98545e0e46e070..7130dec405e01152ab68d8df8f22a55f875a65be 100644 (file)
--- a/hamnadmin/register/models.py
+++ b/hamnadmin/register/models.py
@@ -25,6 +25,7 @@ class Blog(models.Model):
        authorfilter = models.CharField(max_length=255,default='',blank=True)
        team = models.ForeignKey(Team,db_column='team', blank=True, null=True)
        twitteruser = models.CharField(max_length=255, default='', blank=True)
+       excludestats = models.BooleanField(null=False, blank=False, default=False)
 
        def __unicode__(self):
                return "%s (%s)" % (self.name, self.feedurl)