From 1ab1d900ae6aeb315916f4d82b94fd359854719a Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Fri, 30 Jan 2026 15:00:00 -0800
Subject: [PATCH] Improve error for Postgres admin console links outside of
 root

---
 core/src/org/labkey/core/admin/AdminController.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index 3d375a0b6da..bd0ea647325 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -2625,6 +2625,11 @@ protected UserSchema getUserSchema()
         @Override
         protected QueryView createQueryView(QueryExportForm form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception
         {
+            if (!getContainer().isRoot())
+            {
+                throw new NotFoundException("Available only in the root container");
+            }
+
             if (!CoreSchema.getInstance().getSqlDialect().isPostgreSQL())
             {
                 throw new NotFoundException("Available only with Postgres as the primary database");