app_terminal.py: Fixed a bug where plugin 'Web' handlers were not wor…

…king properly with the url_prefix setting.

gateone/__init__.py

@@ -3,7 +3,7 @@
 __version_info__ = (1, 2, 0)
 __license__ = "AGPLv3" # ...or proprietary (see LICENSE.txt)
 __author__ = 'Dan McDougall <[email protected]>'
-__commit__ = "20151103081614" # Gets replaced by git (holds the date/time)
+__commit__ = "20151103083231" # Gets replaced by git (holds the date/time)
 
 import os
 GATEONE_DIR = os.path.dirname(os.path.abspath(__file__))

gateone/applications/terminal/app_terminal.py

@@ -2845,6 +2845,8 @@ def init(settings):
     for hooks in plugin_hooks.values():
         if 'Web' in hooks:
             for handler in hooks['Web']:
+                if not handler[0].startswith(url_prefix): # Fix it
+                    handler = (url_prefix + handler[0].lstrip('/'), handler[1])
                 if handler in REGISTERED_HANDLERS:
                     continue # Already registered this one
                 else:

gateone/core/server.py

@@ -19,7 +19,7 @@
     }
 }
 __author__ = 'Dan McDougall <[email protected]>'
-__commit__ = "20151103081614" # Gets replaced by git (holds the date/time)
+__commit__ = "20151103083231" # Gets replaced by git (holds the date/time)
 
 # NOTE: Docstring includes reStructuredText markup for use with Sphinx.
 __doc__ = '''\
@@ -995,7 +995,6 @@ class MainHandler(BaseHandler):
     """
     @tornado.web.authenticated
     @tornado.web.addslash
-    # TODO: Get this auto-minifying gateone.js
     def get(self):
         # Set our server header so it doesn't say TornadoServer/<version>
         hostname = os.uname()[1]
@@ -3717,7 +3716,7 @@ def __init__(self, settings, **kwargs):
             (r"%sstatic/(.*)" % url_prefix, StaticHandler, {"path": static_url}
         ))
         # Hook up the hooks
-        for plugin_name, hooks in PLUGIN_HOOKS.items():
+        for hooks in PLUGIN_HOOKS.values():
             if 'Web' in hooks:
                 # Apply the plugin's Web handlers
                 fixed_hooks = []