DASH-29 Update to hide formula fields from data export.

pixl8 · Jun 21, 2024 · c2c01bc · c2c01bc
1 parent 4c8696b
commit c2c01bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/handlers/admin/datamanager/admin_dashboard.cfc b/handlers/admin/datamanager/admin_dashboard.cfc
@@ -57,6 +57,12 @@ component extends="preside.system.base.AdminHandler" {
 					, adminUserGroups = { type="varchar", value=adminUserGroups, list=true }
 				  }
 			} );
+
+			ArrayAppend( args.selectFields, "owner_id"         );
+			ArrayAppend( args.selectFields, "view_groups_list" );
+			ArrayAppend( args.selectFields, "view_users_list"  );
+			ArrayAppend( args.selectFields, "edit_groups_list" );
+			ArrayAppend( args.selectFields, "edit_users_list"  );
 		}
 	}
 
@@ -89,6 +95,12 @@ component extends="preside.system.base.AdminHandler" {
 		QueryAddColumn( records, "canShare" , canShare  );
 		QueryAddColumn( records, "canDelete", canDelete );
 		QueryAddColumn( records, "canClone" , canClone  );
+
+		QueryDeleteColumn( records, "owner_id"         );
+		QueryDeleteColumn( records, "view_groups_list" );
+		QueryDeleteColumn( records, "view_users_list"  );
+		QueryDeleteColumn( records, "edit_groups_list" );
+		QueryDeleteColumn( records, "edit_users_list"  );
 	}
 
 	private array function getRecordActionsForGridListing( event, rc, prc, args={} ) {

diff --git a/preside-objects/admin_dashboard.cfc b/preside-objects/admin_dashboard.cfc
@@ -25,9 +25,9 @@ component  {
 	property name="edit_groups" adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_group" relatedVia="admin_dashboard_edit_group" cloneable=false;
 	property name="edit_users"  adminRenderer="ObjectRelatedRecordsList" relationship="many-to-many" relatedTo="security_user"  relatedVia="admin_dashboard_edit_user"  cloneable=false;
 
-	property name="owner_id"         adminRenderer="none" type="string" formula="${prefix}owner.id";
-	property name="view_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_groups.id )";
-	property name="view_users_list"  adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_users.id )";
-	property name="edit_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_groups.id )";
-	property name="edit_users_list"  adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_users.id )";
+	property name="owner_id"         adminRenderer="none" type="string" formula="${prefix}owner.id"                                excludeDataExport=true;
+	property name="view_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_groups.id )" excludeDataExport=true;
+	property name="view_users_list"  adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}view_users.id )"  excludeDataExport=true;
+	property name="edit_groups_list" adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_groups.id )" excludeDataExport=true;
+	property name="edit_users_list"  adminRenderer="none" type="string" formula="group_concat( distinct ${prefix}edit_users.id )"  excludeDataExport=true;
 }