Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Platform agnostic error message (#37005)

Browse Source 
Current error message has macOS specific language. We use this error
message for all platforms.
This commit is contained in:
Noah Talerman
2025-12-09 13:18:20 -08:00
committed by GitHub
parent 4a4ac4380c
commit 25d65aed7b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx
+1 -1
View File
@@ -14,7 +14,7 @@ const baseClass = "delete-software-modal";
const DELETE_SW_USED_BY_POLICY_ERROR_MSG =
"Couldn't delete. Policy automation uses this software. Please disable policy automation for this software and try again.";
const DELETE_SW_INSTALLED_DURING_SETUP_ERROR_MSG =
"Couldn't delete. This software is installed when new Macs boot. Please remove software in Controls > Setup experience and try again.";
"Couldn't delete. This software is installed during new host setup. Please remove software in Controls > Setup experience and try again.";
interface IDeleteSoftwareModalProps {
softwareId: number;
server/datastore/mysql/software_installers.go
+1 -1
View File
@@ -1018,7 +1018,7 @@ WHERE
var (
errDeleteInstallerWithAssociatedPolicy = &fleet.ConflictError{Message: "Couldn't delete. Policy automation uses this software. Please disable policy automation for this software and try again."}
errDeleteInstallerInstalledDuringSetup = &fleet.ConflictError{Message: "Couldn't delete. This software is installed when new Macs boot. Please remove software in Controls > Setup experience and try again."}
errDeleteInstallerInstalledDuringSetup = &fleet.ConflictError{Message: "Couldn't delete. This software is installed during new host setup. Please remove software in Controls > Setup experience and try again."}
)
func (ds *Datastore) DeleteSoftwareInstaller(ctx context.Context, id uint) error {