fix: redirect to wiki space default page on click of logo

frappe · Apr 5, 2024 · f8e11c0 · f8e11c0
1 parent 6f61545
commit f8e11c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/wiki/wiki/doctype/wiki_page/templates/wiki_navbar.html b/wiki/wiki/doctype/wiki_page/templates/wiki_navbar.html
@@ -6,7 +6,7 @@
 
 <nav class="wiki-navbar navbar navbar-light navbar-expand-lg sticky-top pr-4">
     <div class="navbar-brand-container">
-      <a class="navbar-brand" alt="Go to home page" href="{{ url_prefix or "" }}{{ home_page or "/" }}">
+      <a class="navbar-brand" alt="Go to home page" data-prefix="{{ url_prefix }}" href="{{ url_prefix or "" }}{{ home_page or "/" }}">
         {%- if light_mode_logo -%}
           <img alt="Logo" data-alt-src="{{ dark_mode_logo }}" src='{{ light_mode_logo }}'>
         {%- elif dark_mode_logo -%}

diff --git a/wiki/wiki/doctype/wiki_page/wiki_page.py b/wiki/wiki/doctype/wiki_page/wiki_page.py
@@ -225,9 +225,8 @@ def get_context(self, context):
 		context.add_dark_mode = wiki_settings.add_dark_mode
 		context.light_mode_logo = wiki_space.light_mode_logo or wiki_settings.logo
 		context.dark_mode_logo = wiki_space.dark_mode_logo or wiki_settings.dark_mode_logo
-		context.home_page = (
-			wiki_space.route if wiki_space.light_mode_logo or wiki_space.dark_mode_logo else "/"
-		)
+		if wiki_space.light_mode_logo or wiki_space.dark_mode_logo:
+			context.home_page = "/" + wiki_space.route
 		context.script = wiki_settings.javascript
 		context.show_feedback = wiki_settings.enable_feedback
 		context.ask_for_contact_details = wiki_settings.ask_for_contact_details