Skip to content

Commit 60f1f01

Browse files
authored
Merge pull request #6366 from bollwyvl/add-default-page-config
Initialize handler page_config from Server traitlets
2 parents af6eddd + be7cbeb commit 60f1f01

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

notebook/app.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ def get_page_config(self):
3232
config = LabConfig()
3333
app = self.extensionapp
3434
base_url = self.settings.get("base_url")
35-
36-
page_config = {
37-
"appVersion": version,
38-
"baseUrl": self.base_url,
39-
"terminalsAvailable": self.settings.get("terminals_available", False),
40-
"token": self.settings["token"],
41-
"fullStaticUrl": ujoin(self.base_url, "static", self.name),
42-
"frontendUrl": ujoin(self.base_url, "/"),
43-
"exposeAppInBrowser": app.expose_app_in_browser,
44-
"collaborative": app.collaborative,
45-
}
35+
page_config = self.settings.setdefault("page_config_data", {})
36+
page_config.update(
37+
{
38+
"appVersion": version,
39+
"baseUrl": self.base_url,
40+
"terminalsAvailable": self.settings.get("terminals_available", False),
41+
"token": self.settings["token"],
42+
"fullStaticUrl": ujoin(self.base_url, "static", self.name),
43+
"frontendUrl": ujoin(self.base_url, "/"),
44+
"exposeAppInBrowser": app.expose_app_in_browser,
45+
"collaborative": app.collaborative,
46+
}
47+
)
4648

4749
if "hub_prefix" in app.serverapp.tornado_settings:
4850
tornado_settings = app.serverapp.tornado_settings
2.27 KB
Loading
1.92 KB
Loading

0 commit comments

Comments
 (0)