diff options
Diffstat (limited to 'mailman/database')
| -rw-r--r-- | mailman/database/mailinglist.py | 7 | ||||
| -rw-r--r-- | mailman/database/mailman.sql | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mailman/database/mailinglist.py b/mailman/database/mailinglist.py index 641245daf..483cc4749 100644 --- a/mailman/database/mailinglist.py +++ b/mailman/database/mailinglist.py @@ -19,6 +19,7 @@ import os import string from storm.locals import * +from urlparse import urljoin from zope.interface import implements from mailman import Defaults @@ -45,7 +46,6 @@ class MailingList(Model): host_name = Unicode() # Attributes not directly modifiable via the web u/i created_at = DateTime() - web_page_url = Unicode() admin_member_chunksize = Int() hold_and_cmd_autoresponses = Pickle() # Attributes which are directly modifiable via the web u/i. The more @@ -202,9 +202,12 @@ class MailingList(Model): def script_url(self, target, context=None): """See `IMailingList`.""" + # Find the domain for this mailing list. + domain = config.domains[self.host_name] # XXX Handle the case for when context is not None; those would be # relative URLs. - return self.web_page_url + target + '/' + self.fqdn_listname + return urljoin(domain.base_url, + target + Defaults.CGIEXT + '/' + self.fqdn_listname) @property def data_path(self): diff --git a/mailman/database/mailman.sql b/mailman/database/mailman.sql index 3cef32e24..b098ed13b 100644 --- a/mailman/database/mailman.sql +++ b/mailman/database/mailman.sql @@ -30,7 +30,6 @@ CREATE TABLE mailinglist ( list_name TEXT, host_name TEXT, created_at TIMESTAMP, - web_page_url TEXT, admin_member_chunksize INTEGER, hold_and_cmd_autoresponses BLOB, next_request_id INTEGER, |