If generating controller-first URLs, ignore the setting to reject them

Author: labkey-adam

api/src/org/labkey/api/view/ActionURL.java

@@ -555,7 +555,8 @@ public ActionURL setPath(Path path)
         }
         else
         {
-            if (OptionalFeatureService.get().isFeatureEnabled(AppProps.REJECT_CONTROLLER_FIRST_URLS))
+            // Reject controller-first URLs if that experimental feature is enabled AND the generate controller-first URLs option is NOT enabled. Otherwise, admin would end up in a very bad state.
+            if (OptionalFeatureService.get().isFeatureEnabled(AppProps.REJECT_CONTROLLER_FIRST_URLS) && !OptionalFeatureService.get().isFeatureEnabled(AppProps.GENERATE_CONTROLLER_FIRST_URLS))
                 throw new IllegalArgumentException("Controller-first URLs are not allowed! (" + savedPath +")");
             setIsCanonical(!useContainerRelativeURL());
         }

core/src/org/labkey/core/CoreModule.java

@@ -550,12 +550,12 @@ public QuerySchema createSchema(DefaultSchema schema, Module module)
         ));
         OptionalFeatureService.get().addFeatureFlag(new OptionalFeatureFlag(AppProps.GENERATE_CONTROLLER_FIRST_URLS,
             "Restore controller-first URLS",
-            "Generate URLs in a legacy format the puts the controller before the folder path. This option will be removed in LabKey Server 26.3.",
+            "Generate URLs in a legacy format that puts the controller name before the folder path. This option will be removed in LabKey Server 26.3.",
             false, false, OptionalFeatureService.FeatureType.Deprecated
         ));
         OptionalFeatureService.get().addExperimentalFeatureFlag(AppProps.REJECT_CONTROLLER_FIRST_URLS,
             "Reject controller-first URLs",
-            "Require standard path-first URLs.",
+            "Require standard path-first URLs. Note: This option will be ignored if the deprecated feature for generating controller-first URLs is enabled.",
             false
         );