From 6b22390604d58513d78a82c70b88a4f3aae7b14a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 23 Sep 2023 17:57:06 -0400 Subject: [PATCH] Tweaked Document Versioning logic, this update will update the db to update all exisiting document to update document_parent with the same primary_key ID --- client_document_details.php | 21 ++++++--------------- client_document_edit_modal.php | 1 + database_updates.php | 13 +++++++++++-- database_version.php | 2 +- post/document.php | 19 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/client_document_details.php b/client_document_details.php index 1fa57a30..80b2de66 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -232,29 +232,20 @@ $document_parent = intval($row['document_parent']);
Revisions
"> - + diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php index c03254a8..4482f7b6 100644 --- a/client_document_edit_modal.php +++ b/client_document_edit_modal.php @@ -9,6 +9,7 @@
+
diff --git a/database_updates.php b/database_updates.php index fd14e04e..2860e108 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1339,11 +1339,20 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.3'"); } - //if (CURRENT_DATABASE_VERSION == '0.8.3') { + if (CURRENT_DATABASE_VERSION == '0.8.3') { //Insert queries here required to update to DB version 0.8.4 + mysqli_query($mysqli, "UPDATE `documents` SET `document_parent` = `document_id`"); + // Then, update the database to the next sequential version - //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.4'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.4'"); + } + + //if (CURRENT_DATABASE_VERSION == '0.8.4') { + //Insert queries here required to update to DB version 0.8.5 + + // Then, update the database to the next sequential version + //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.5'"); //} } else { diff --git a/database_version.php b/database_version.php index f60a8cd1..9f550e57 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.8.3"); +DEFINE("LATEST_DATABASE_VERSION", "0.8.4"); diff --git a/post/document.php b/post/document.php index 6d84de74..f5de1e90 100644 --- a/post/document.php +++ b/post/document.php @@ -20,6 +20,9 @@ if (isset($_POST['add_document'])) { $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id"); $document_id = mysqli_insert_id($mysqli); + // Update field document_parent to be the same id as document ID as this is the only version of the document. + mysqli_query($mysqli,"UPDATE documents SET document_parent = $document_id WHERE document_id = $document_id"); + // Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Create', log_description = 'Created $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); @@ -73,7 +76,7 @@ if (isset($_POST['add_document_from_template'])) { $content_raw = sanitizeInput($_POST['name'] . " " . str_replace("<", " <", $row['document_content'])); // Document add query - $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$document_name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$document_name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id"); $document_id = mysqli_insert_id($mysqli); @@ -91,6 +94,7 @@ if (isset($_POST['edit_document'])) { validateTechRole(); $document_id = intval($_POST['document_id']); + $document_parent = intval($_POST['document_parent']); $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); $content = mysqli_real_escape_string($mysqli,$_POST['content']); @@ -103,16 +107,11 @@ if (isset($_POST['edit_document'])) { $new_document_id = mysqli_insert_id($mysqli); - // Document edit query - mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id, document_archived_at = NOW() WHERE document_id = $document_id"); + // Update the parent ID of the new document to match its new document ID + mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id WHERE document_id = $new_document_id"); - // Update all Previous versions with the new parent document ID - $sql_documents = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_parent = $document_id"); - - while ($row = mysqli_fetch_array($sql_documents)) { - $old_document_id = intval($row['document_id']); - mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id WHERE document_id = $old_document_id"); - } + // Link all exisiting links with old document with new document + mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id, document_archived_at = NOW() WHERE document_parent = $document_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Edit', log_description = '$session_name Edited document $name previous version was kept', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $new_document_id");