瀏覽代碼

Merge pull request #8788 from datalayer-contrib/workspaceapp-base-url

Correctly set base_url on workspace apps
Eric Charles 4 年之前
父節點
當前提交
239d228577
共有 1 個文件被更改,包括 2 次插入6 次删除
  1. 2 6
      jupyterlab/labapp.py

+ 2 - 6
jupyterlab/labapp.py

@@ -259,9 +259,7 @@ class LabWorkspaceExportApp(JupyterApp):
     """
     def start(self):
         app = LabApp(config=self.config)
-        # TODO(@echarles) Fix this...
-#        base_url = app.serverapp.base_url
-        base_url = '/'
+        base_url = app.settings.get('base_url', '/')
         directory = app.workspaces_dir
         app_url = app.app_url
 
@@ -310,9 +308,7 @@ class LabWorkspaceImportApp(JupyterApp):
 
     def start(self):
         app = LabApp(config=self.config)
-#        base_url = app.serverapp.base_url
-        # TODO(@echarles) Fix this...
-        base_url = '/'
+        base_url = app.settings.get('base_url', '/')
         directory = app.workspaces_dir
         app_url = app.app_url
         workspaces_url = ujoin(app.app_url, 'workspaces')