All purge_urls must be rooted, since we add ^ at the beginning

diff --git a/pgweb/contributors/models.py b/pgweb/contributors/models.py
index cc28be6f2429880c6aae0871da4eedeca2a977a8..e0622df42490d6ea7d3cdc8b8a3e3485636e376f 100644 (file)
--- a/pgweb/contributors/models.py
+++ b/pgweb/contributors/models.py
@@ -8,7 +8,7 @@ class ContributorType(PgModel, models.Model):
        extrainfo = models.TextField(null=True, blank=True)
        detailed = models.BooleanField(null=False, default=True)
 
-       purge_urls = ('community/contributors/', )
+       purge_urls = ('/community/contributors/', )
 
        def __unicode__(self):
                return self.typename
@@ -26,7 +26,7 @@ class Contributor(PgModel, models.Model):
        location = models.CharField(max_length=100, null=True, blank=True)
        contribution = models.TextField(null=True, blank=True)
 
-       purge_urls = ('community/contributors/', )
+       purge_urls = ('/community/contributors/', )
 
        def __unicode__(self):
                return "%s %s" % (self.firstname, self.lastname)

diff --git a/pgweb/featurematrix/models.py b/pgweb/featurematrix/models.py
index 1d215cd5c69d2567a1b50fb6ae12e6bc9f1ed665..46f80fca23ce73ae5e403c701c0edb97b7c3230b 100644 (file)
--- a/pgweb/featurematrix/models.py
+++ b/pgweb/featurematrix/models.py
@@ -14,7 +14,7 @@ class FeatureGroup(PgModel, models.Model):
        groupname = models.CharField(max_length=100, null=False, blank=False)
        groupsort = models.IntegerField(null=False, blank=False)
 
-       purge_urls = ('about/featurematrix/', )
+       purge_urls = ('/about/featurematrix/', )
 
        def __unicode__(self):
                return self.groupname
@@ -38,7 +38,7 @@ class Feature(PgModel, models.Model):
        v90 = models.IntegerField(null=False, blank=False, default=0, verbose_name="9.0", choices=choices)
        v91 = models.IntegerField(null=False, blank=False, default=0, verbose_name="9.1", choices=choices)
 
-       purge_urls = ('about/featurematrix/.*', )
+       purge_urls = ('/about/featurematrix/.*', )
 
        def __unicode__(self):
                # To make it look good in the admin interface, just don't render it

diff --git a/pgweb/lists/models.py b/pgweb/lists/models.py
index e7d5d9e2765e0f80b96786e08721fa3bd38ab553..dc8ab13b7722ce59c70c2887d5654feb51de5151 100644 (file)
--- a/pgweb/lists/models.py
+++ b/pgweb/lists/models.py
@@ -6,7 +6,7 @@ class MailingListGroup(PgModel, models.Model):
        groupname = models.CharField(max_length=64, null=False, blank=False)
        sortkey = models.IntegerField(null=False, default=10)
 
-       purge_urls = ('community/lists/', )
+       purge_urls = ('/community/lists/', )
 
        def __unicode__(self):
                return self.groupname
@@ -22,7 +22,7 @@ class MailingList(PgModel, models.Model):
        description = models.TextField(null=False, blank=True)
        shortdesc = models.TextField(null=False, blank=True)
 
-       purge_urls = ('community/lists/', )
+       purge_urls = ('/community/lists/', )
 
        @property
        def maybe_shortdesc(self):

diff --git a/pgweb/profserv/models.py b/pgweb/profserv/models.py
index 80354b6ff0b7a7ee00b239325653ac275e94f7f7..f0a779aa3ed4b27fbe538856a5295a403c6c5415 100644 (file)
--- a/pgweb/profserv/models.py
+++ b/pgweb/profserv/models.py
@@ -28,7 +28,7 @@ class ProfessionalService(PgModel, models.Model):
        provides_hosting = models.BooleanField(null=False, default=False)
        interfaces = models.CharField(max_length=512, null=True, blank=True, verbose_name="Interfaces (for hosting)")
        
-       purge_urls = ('support/professional_', )
+       purge_urls = ('/support/professional_', )
        
        send_notification = True
        

diff --git a/pgweb/sponsors/models.py b/pgweb/sponsors/models.py
index 1f61592dc4d97752b408daffa1a3033026159a7e..b622c28e2806bfe94deef941db19f2535cd799f4 100644 (file)
--- a/pgweb/sponsors/models.py
+++ b/pgweb/sponsors/models.py
@@ -8,8 +8,9 @@ class SponsorType(PgModel, models.Model):
        typename = models.CharField(max_length=32, null=False, blank=False)
        description = models.TextField(null=False, blank=False)
        sortkey = models.IntegerField(null=False, default=10)
+       # sortkey==0 --> do not show in list
 
-       purge_urls = ('about/servers/', 'about/sponsors/', )
+       purge_urls = ('/about/servers/', '/about/sponsors/', )
 
        def __unicode__(self):
                return self.typename
@@ -24,7 +25,7 @@ class Sponsor(PgModel, models.Model):
        logoname = models.CharField(max_length=64, null=False, blank=False)
        country = models.ForeignKey(Country, null=False)
 
-       purge_urls = ('about/sponsors/', )
+       purge_urls = ('/about/sponsors/', )
 
        def __unicode__(self):
                return self.name
@@ -41,7 +42,7 @@ class Server(PgModel, models.Model):
        location = models.CharField(max_length=128, null=False, blank=False)
        usage = models.TextField(null=False, blank=False)
        
-       purge_urls = ('about/servers/', )
+       purge_urls = ('/about/servers/', )
 
        def __unicode__(self):
                return self.name

diff --git a/pgweb/survey/models.py b/pgweb/survey/models.py
index f4d3eb65851887c2ba16b00a3d285f639dfd44ee..6fb6b93407273efd03d10aef5295b89ce5d57e18 100644 (file)
--- a/pgweb/survey/models.py
+++ b/pgweb/survey/models.py
@@ -29,7 +29,7 @@ class Survey(PgModel, models.Model):
        posted = models.DateTimeField(null=False, default=datetime.now)
        current = models.BooleanField(null=False, default=False)
 
-       purge_urls = ('community/survey', )
+       purge_urls = ('/community/survey', )
 
        def __unicode__(self):
                return self.question
@@ -93,7 +93,7 @@ class SurveyAnswer(PgModel, models.Model):
        tot7 = models.IntegerField(null=False, default=0)
        tot8 = models.IntegerField(null=False, default=0)
 
-       purge_urls = ('community/survey', )
+       purge_urls = ('/community/survey', )
 
 class SurveyLock(models.Model):
        ipaddr = models.IPAddressField(null=False, blank=False)