From 0948fd4dc669cfc51cf6c599af10fd384b0c0035 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 6 Jan 2024 16:05:28 -0500 Subject: [PATCH] Added a setting to enable destructive delete, disabled by default must enable it in the DB for now not in the settings DB 1.0.0 has been reached --- client_assets.php | 5 +++++ client_contacts.php | 2 ++ client_locations.php | 2 ++ client_software.php | 2 ++ client_vendors.php | 2 ++ database_updates.php | 14 +++++++++++--- database_version.php | 2 +- get_settings.php | 3 +++ products.php | 2 ++ 9 files changed, 30 insertions(+), 4 deletions(-) diff --git a/client_assets.php b/client_assets.php index 4dfee7d9..3c954161 100644 --- a/client_assets.php +++ b/client_assets.php @@ -345,6 +345,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive + + + Delete + + diff --git a/client_contacts.php b/client_contacts.php index 084835e6..6dce4fd4 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -218,10 +218,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive +
Delete + diff --git a/client_locations.php b/client_locations.php index d4037580..6745c39d 100644 --- a/client_locations.php +++ b/client_locations.php @@ -141,10 +141,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive +
Delete + diff --git a/client_software.php b/client_software.php index 8a6a5607..00831121 100644 --- a/client_software.php +++ b/client_software.php @@ -188,9 +188,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive and
Remove Licenses +
Delete and
Remove Licenses + diff --git a/client_vendors.php b/client_vendors.php index 515bc2d8..44920244 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -157,10 +157,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive +
Delete + diff --git a/database_updates.php b/database_updates.php index 1ba8ada7..ce38b2e2 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1532,14 +1532,22 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.9.9'"); } + if (CURRENT_DATABASE_VERSION == '0.9.9') { + //Insert queries here required to update to DB version 1.0.0 + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_destructive_deletes_enable` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_timezone`"); + + //Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.0'"); + } + // Be sure to change database_version.php to reflect the version you are updating to here // Please add this same comment block to the bottom of this file, and update the version number. // Uncomment Below Lines, to add additional database updates // - // if (CURRENT_DATABASE_VERSION == '0.9.9') { - // // Insert queries here required to update to DB version 0.10.0 + // if (CURRENT_DATABASE_VERSION == '1.0.0') { + // // Insert queries here required to update to DB version 1.0.1 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.10.0'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'"); // } } else { diff --git a/database_version.php b/database_version.php index 0e02bd3d..a7a46617 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.9.9"); +DEFINE("LATEST_DATABASE_VERSION", "1.0.0"); diff --git a/get_settings.php b/get_settings.php index 72a1a13d..2a8cdeaa 100644 --- a/get_settings.php +++ b/get_settings.php @@ -108,6 +108,9 @@ $config_theme_mode = "dark_mode"; // Telemetry $config_telemetry = intval($row['config_telemetry']); +// Destructive Deletes +$config_destructive_deletes_enable = intval($row['config_destructive_deletes_enable']); + // Select Arrays diff --git a/products.php b/products.php index 18e6ab4f..f8cd081e 100644 --- a/products.php +++ b/products.php @@ -109,10 +109,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive +
Delete +