summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2000-08-01 23:07:41 +0000
committerbwarsaw2000-08-01 23:07:41 +0000
commitab6d7f0111dcf641ae3326fbf7d1f3a6790fe9a1 (patch)
tree9cf3287a2fbf35844ef5b2672d65abb69661063c
parentd772bed94c30a1a03262a0ff02987a6c5643a380 (diff)
downloadmailman-ab6d7f0111dcf641ae3326fbf7d1f3a6790fe9a1.tar.gz
mailman-ab6d7f0111dcf641ae3326fbf7d1f3a6790fe9a1.tar.zst
mailman-ab6d7f0111dcf641ae3326fbf7d1f3a6790fe9a1.zip
Cleanups to fix relative/absolute script url calculation in response
to SF Bug #110753. Specifically, PrintRequests(): Use Utils.ScriptURL() instead of GetNestingLevel(), and GetScriptURL() instead of GetRelativeScriptURL(). Also fix usage of GetOptionsURL() for new interface.
-rw-r--r--Mailman/Cgi/admindb.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index 9bc9d7e62..638260773 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -109,7 +109,7 @@ def PrintRequests(mlist, doc):
if not mlist.NumRequestsPending():
doc.AddItem('There are no pending requests. You can now ')
doc.AddItem(
- Link(mlist.GetRelativeScriptURL('admin'),
+ Link(mlist.GetScriptURL('admin'),
Italic('view or edit the list configuration information.')))
doc.AddItem(mlist.GetMailmanFooter())
return
@@ -117,10 +117,10 @@ def PrintRequests(mlist, doc):
doc.AddItem(Utils.maketext(
'admindbpreamble.html', {'listname': mlist.real_name}, raw=1))
doc.AddItem(
- Link(mlist.GetRelativeScriptURL('admin'),
+ Link(mlist.GetScriptURL('admin'),
Italic('view or edit the list configuration information')))
doc.AddItem('.<p>')
- form = Form(mlist.GetRelativeScriptURL('admindb'))
+ form = Form(mlist.GetScriptURL('admindb'))
doc.AddItem(form)
form.AddItem(SubmitButton('submit', 'Submit All Data'))
#