- Fix several ZMI links so they respect virtual hosting (fixes #788)

Conflicts: CHANGES.rst
zopefoundation · Feb 19, 2020 · 3a0a423 · 3a0a423
1 parent 8cd9bb6
commit 3a0a423
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,9 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.0a1 (unreleased)
 ------------------
 
+- Fix several ZMI links so they respect virtual hosting
+  (`#788 <https://github.com/zopefoundation/Zope/issues/788>`_)
+
 - Remove deprecated ``postProcessInputs`` request method
   (`#782 <https://github.com/zopefoundation/Zope/issues/782>`_)
 

diff --git a/src/App/dtml/manage_navbar.dtml b/src/App/dtml/manage_navbar.dtml
@@ -9,7 +9,8 @@
        aria-label="Toggle Tab-Navigation">
     <i class="fa fa-bars"></i>
   </div>
-  <a class="navbar-brand" title="To Zope Root" href="/manage" target="_parent">
+  <a class="navbar-brand" title="To Zope Root"
+     href="<dtml-var "REQUEST.getVirtualRoot()">/manage" target="_parent">
     <span class="product">ZOPE 4</span>
   </a>
   <ul class="navbar-nav flex-row ml-sm-auto d-flex">
@@ -33,7 +34,7 @@
 
     <li class="form-inline zmi-cp">
       <a title="Control Panel"
-         href="/Control_Panel/manage_main" target="_self">
+         href="<dtml-var "REQUEST.getVirtualRoot()">/Control_Panel/manage_main" target="_self">
         <i class="fa fa-cog"></i>
         <span class="zmi-label">Control&nbsp;Panel</span>
       </a>

diff --git a/src/App/dtml/menu.dtml b/src/App/dtml/menu.dtml
@@ -11,28 +11,30 @@
 		><i class="fa fa-cog"></i>
 	</a>
 	<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+	  <dtml-let cp_url="Control_Panel.absolute_url()">
 		<li><a id="menu_refresh" href="manage_menu">Refresh</a></li>
 		<li><a id="menu_save" href="manage_menu?save_layout=1">Save layout</a></li>
 
 		<li><a id="menu_cp" title="Control Panel"
-			href="/Control_Panel/manage_main" target="manage_main">Control Panel</a></li>
+			href="&dtml-cp_url;/manage_main" target="manage_main">Control Panel</a></li>
 		<dtml-try>
 			<dtml-in "Control_Panel.Database.getDatabaseNames(quote=True)">
 				<li><a title="Zope Object Database Manager" target="manage_main"
-					href="/Control_Panel/Database/<dtml-var "_['sequence-item']">/manage_main">ZODB <dtml-var "_['sequence-item']"></a></li>
+					href="&dtml-cp_url;/Database/<dtml-var "_['sequence-item']">/manage_main">ZODB <dtml-var "_['sequence-item']"></a></li>
 			</dtml-in>
 		<dtml-except AttributeError>
 		<dtml-except NameError>
 		</dtml-try>
 		<li><a id="menu_undo"
-			href="/Control_Panel/Database/main/manage_UndoForm" target="manage_main">Undo</a></li>
+			href="&dtml-cp_url;/Database/main/manage_UndoForm" target="manage_main">Undo</a></li>
 
 		<li><a id="menu_logout" href="manage_zmi_logout">Logout</a></li>
 		<li role="separator" class="divider">&nbsp;</li>
 		<li><a id="menu_copyright" href="zope_copyright"
 			target="manage_main">&copy; Zope Foundation</a></li>
 		<li><a id="menu_zope" href="http://www.zope.org"
 			target="_blank">www.zope.org</a></li>
+	  </dtml-let>
 	</ul>
 </div>