Make call from

LabKey · Nov 14, 2024 · b5ba290 · b5ba290
1 parent 52cf0f6
commit b5ba290
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
@@ -449,8 +449,7 @@ public static void registerAdminConsoleLinks()
         AdminConsole.addLink(Configuration, "system maintenance", new ActionURL(ConfigureSystemMaintenanceAction.class, root));
         AdminConsole.addLink(Configuration, "external redirect hosts", new ActionURL(ExternalHostsAdminAction.class, root).addParameter("type", ExternalServerType.Redirect.name()), TroubleshooterPermission.class);
         AdminConsole.addLink(Configuration, "external allowed sources", new ActionURL(ExternalHostsAdminAction.class, root).addParameter("type", ExternalServerType.Source.name()), TroubleshooterPermission.class);
-        if (ModuleLoader.getInstance().hasModule("Premium"))
-            AdminConsole.addLink(Configuration, "allowed file extensions", new ActionURL(ExternalHostsAdminAction.class, root).addParameter("type", ExternalServerType.FileExtension.name()), TroubleshooterPermission.class);
+        AdminConsole.addLink(Configuration, "allowed file extensions", new ActionURL(ExternalHostsAdminAction.class, root).addParameter("type", ExternalServerType.FileExtension.name()), TroubleshooterPermission.class);
 
         // Diagnostics
         AdminConsole.addLink(Diagnostics, "actions", new ActionURL(ActionsAction.class, root));

diff --git a/core/src/org/labkey/core/admin/ExternalServerType.java b/core/src/org/labkey/core/admin/ExternalServerType.java
@@ -59,6 +59,12 @@ public HtmlString getTitle()
         {
             return HtmlString.of(String.format("External %1$s Host", name()));
         }
+
+        @Override
+        public HtmlString getLabel()
+        {
+            return HtmlString.of("Host");
+        }
     },
     Redirect {
         @Override
@@ -100,6 +106,12 @@ public HtmlString getTitle()
         {
             return HtmlString.of(String.format("External %1$s Host", name()));
         }
+
+        @Override
+        public HtmlString getLabel()
+        {
+            return HtmlString.of("Host");
+        }
     },
     FileExtension {
         @Override
@@ -145,6 +157,12 @@ public HtmlString getTitle()
         {
             return HtmlString.of("Allowed File Extension");
         }
+
+        @Override
+        public HtmlString getLabel()
+        {
+            return HtmlString.of("Extension");
+        }
     };
 
     private static final AuthorityValidator AUTHORITY_VALIDATOR = new AuthorityValidator(UrlValidator.ALLOW_LOCAL_URLS);
@@ -158,6 +176,7 @@ public static String getExternalSourceHostsKey()
     public abstract List<String> getHosts();
     public abstract void setHosts(Collection<String> redirectHosts);
     public abstract HtmlString getTitle();
+    public abstract HtmlString getLabel();
 
 
     public String getHelpTopic()

diff --git a/core/src/org/labkey/core/admin/addNewExternalHost.jsp b/core/src/org/labkey/core/admin/addNewExternalHost.jsp
@@ -43,7 +43,7 @@
 <labkey:form method="post">
     <table>
         <tr>
-            <td class="labkey-form-label"><label for="newExternalHostTextField">Host</label></td>
+            <td class="labkey-form-label"><label for="newExternalHostTextField"><%=bean.getTypeEnum().getLabel()%></label></td>
             <td><input name="newExternalHost" id="newExternalHostTextField" size="75" /></td>
         </tr>
         <tr>

diff --git a/core/src/org/labkey/core/webdav/DavController.java b/core/src/org/labkey/core/webdav/DavController.java
@@ -3076,7 +3076,7 @@ public void closeInputStream() throws IOException
             };
             if (FileUtil.isAllowedFileName(name) != null)
             {
-                throw new IOException("File extension not allowed.");
+                throw new IOException("The file extension is not allowed.");
             }
             AntiVirusService avs = AntiVirusService.get();