Mercurial > public > src > moin > extensions

changeset 597:0b31dafef3cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bbb: script name added to url
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Wed, 13 Jun 2012 10:18:12 +0200
parents 84ef153f8363
children 9e82360a5592
files data/plugin/action/submit_bbb_create_meeting.py data/plugin/parser/bbb_create.py
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/action/submit_bbb_create_meeting.py	Wed Jun 13 09:11:54 2012 +0200
+++ b/data/plugin/action/submit_bbb_create_meeting.py	Wed Jun 13 10:18:12 2012 +0200
@@ -53,8 +53,10 @@
             request.theme.add_msg(msg[0], msg[1])
             Page(request, pagename).send_page()
             return
-
-        url = "%s/%s" % (request.getQualifiedURL(), pagename)
+        scriptname = request.script_root
+        if scriptname:
+            scriptname = scriptname.lstrip('/') + '/'
+        url = "%s%s%s" % (request.host_url, scriptname, pagename.lstrip('/'))
         session = Meeting_Setup(bbb_api_url=bbb_settings.BBB_API_URL,
                                 salt=bbb_settings.SALT,
                                 meeting_name=request.form["meeting_name"],
--- a/data/plugin/parser/bbb_create.py	Wed Jun 13 09:11:54 2012 +0200
+++ b/data/plugin/parser/bbb_create.py	Wed Jun 13 10:18:12 2012 +0200
@@ -70,7 +70,10 @@
 
         if request.user.valid and username in bbb_admin_group:
             recreate = True
-            url = "%s/%s" % (request.getQualifiedURL(), pagename)
+            scriptname = request.script_root
+            if scriptname:
+                scriptname = scriptname.lstrip('/') + '/'
+            url = "%s%s%s" % (request.host_url, scriptname, pagename.lstrip('/'))
             msg = "(!) Meeting started :) "
             try:
                 session = Meeting_Setup(bbb_api_url=bbb_settings.BBB_API_URL, salt=bbb_settings.SALT,