Merge pull request #741 from DIRACGridBot/cherry-pick-2-380b2571-inte…

…gration [sweep:integration] Re-add support for setting default theme
DIRACGrid · Jul 28, 2023 · 0b4388c · 0b4388c
2 parents 54ffd34 + 90d20ab
commit 0b4388c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/WebAppDIRAC/Lib/Conf.py b/src/WebAppDIRAC/Lib/Conf.py
@@ -238,13 +238,12 @@ def getAuthSectionForHandler(route):
  return f"{BASECS}/Access/{route}"
 
 
-@deprecated("This funtion is deprecated, use 'tabs' instead.")
 def getTheme():
- """Get theme
+ """Get theme from config or return default
 
  :return: str
  """
- return "tabs"
+ return getCSValue("Theme", "crisp")
 
 
 def getIcon():

diff --git a/src/WebAppDIRAC/WebApp/handler/RootHandler.py b/src/WebAppDIRAC/WebApp/handler/RootHandler.py
@@ -152,7 +152,7 @@ def web_loginComplete(self, code: str, state: str, **kwargs):
  )
  return resp
 
- def web_index(self, *, url_state="", theme="crisp", open_app="", **kwargs):
+ def web_index(self, *, url_state="", theme="", open_app="", **kwargs):
  """Index method
 
  :param str url_state: url state
@@ -172,6 +172,9 @@ def web_index(self, *, url_state="", theme="crisp", open_app="", **kwargs):
  except Exception:
  gLogger.warn(f"Welcome page not found here: {welcomeFile}")
 
+ if not theme:
+ theme = Conf.getTheme()
+
  # pylint: disable=no-member
  return TornadoResponse().render(
  "root.tpl",