PRESIDECMS-2613 Add support for and, not, or to help with writing exp…

…ressions in xml
pixl8 · Sep 27, 2023 · 0a1b879 · 0a1b879
1 parent 048715b
commit 0a1b879
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/system/services/features/FeatureService.cfc b/system/services/features/FeatureService.cfc
@@ -98,7 +98,9 @@ component singleton=true autodoc=true displayName="Feature service" {
 		} );
 
 		for( var feature in features ) {
-			compiled = ReplaceNoCase( compiled, feature, isFeatureEnabled( feature, arguments.siteTemplate ) ? "true" : "false", "all" );
+			if ( feature != "not" && feature != "and" && feature != "or" ) {
+				compiled = ReplaceNoCase( compiled, feature, isFeatureEnabled( feature, arguments.siteTemplate ) ? "true" : "false", "all" );
+			}
 		}
 
 		try {

diff --git a/tests/integration/api/features/FeatureServiceTest.cfc b/tests/integration/api/features/FeatureServiceTest.cfc
@@ -36,8 +36,9 @@ component extends="testbox.system.BaseSpec"{
 				var svc = _getService();
 
 				expect( svc.isFeatureEnabled( feature="sites || websiteUsers", siteTemplate="" ) ).toBeTrue();
+				expect( svc.isFeatureEnabled( feature="sites or websiteUsers", siteTemplate="" ) ).toBeTrue();
 				expect( svc.isFeatureEnabled( feature="sites && assetManager", siteTemplate="" ) ).toBeFalse();
-				expect( svc.isFeatureEnabled( feature="sites && websiteUsers", siteTemplate="" ) ).toBeTrue();
+				expect( svc.isFeatureEnabled( feature="sites and websiteUsers", siteTemplate="" ) ).toBeTrue();
 				expect( svc.isFeatureEnabled( feature="(sites || what) && websiteusers", siteTemplate="" ) ).toBeTrue();
 				expect( svc.isFeatureEnabled( feature="((sites && what) && websiteusers)", siteTemplate="" ) ).toBeFalse();
 				expect( svc.isFeatureEnabled( feature="((sites && !what) && websiteusers)", siteTemplate="" ) ).toBeTrue();