Merge branch 'feature-PRESIDECMS-3006_admin-only-feature-flag-issues' into hotfix-10.27.30

Author: DominicWatson

system/config/Config.cfc

@@ -919,7 +919,7 @@ component {
 			, batchOperationSelectAll         = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
 			, useDistinctForDatatables        = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
 			, systemConfiguration             = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
-			, cmsUserManager                  = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "cms"   ] }
+			, cmsUserManager                  = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
 			, errorLogs                       = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
 			, redirectErrorPages              = { enabled=false, siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "cms"   ] }
 			, auditTrail                      = { enabled=true , siteTemplates=[ "*" ], widgets=[]                      , dependsOn=[ "admin" ] }
@@ -1462,7 +1462,7 @@ component {
 			, filterObject           = "security_user"
 			, gridFields             = [ "known_as", "email_address" ]
 			, recipientIdLogProperty = "security_user_recipient"
-			, feature                = "cms"
+			, feature                = "admin"
 		};
 		recipientTypes.websiteUser = {
 			  parameters             = [ "display_name", "login_id", "email_address" ]

system/handlers/admin/DataHelpers.cfc

@@ -5,11 +5,11 @@
  */
 component extends="preside.system.base.adminHandler" {
 
-	property name="adminDataViewsService"   inject="adminDataViewsService";
+	property name="adminDataViewsService"   inject="featureInjector:admin:adminDataViewsService";
 	property name="presideObjectService"    inject="presideObjectService";
-	property name="dataExportService"       inject="dataExportService";
-	property name="adhocTaskManagerService" inject="adhocTaskManagerService";
-	property name="customizationService"    inject="dataManagerCustomizationService";
+	property name="dataExportService"       inject="featureInjector:dataExport:dataExportService";
+	property name="adhocTaskManagerService" inject="featureInjector:adhocTasks:adhocTaskManagerService";
+	property name="customizationService"    inject="featureInjector:admin:dataManagerCustomizationService";
 
 
 	/**

system/views/email/layout/default/html.cfm

@@ -1,4 +1,3 @@
-<!---@feature cms--->
 <cfparam name="args.body"           type="string"            />
 <cfparam name="args.signature_html" type="string" default="" />
 <cfparam name="args.subject"        type="string" default="" />

system/views/email/layout/default/text.cfm

@@ -1,4 +1,3 @@
-<!---@feature cms--->
 <cfparam name="args.body"           default="">
 <cfparam name="args.signature_text" default="">