From b22781d2ea8a316d14e40edc1b5ff3375e2e09bf Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 5 Apr 2024 18:20:09 -0400 Subject: [PATCH] Add Ticket Template order under project templates, this will state the execution order when deployed --- admin_project_template_details.php | 9 ++++++++- database_updates.php | 12 +++++++++--- database_version.php | 2 +- db.sql | 3 ++- post/admin.php | 11 +++++++++++ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/admin_project_template_details.php b/admin_project_template_details.php index 0aa43d12..b516dd58 100644 --- a/admin_project_template_details.php +++ b/admin_project_template_details.php @@ -142,6 +142,7 @@ if (isset($_GET['project_template_id'])) { while ($row = mysqli_fetch_array($sql_ticket_templates)) { $ticket_template_id = intval($row['ticket_template_id']); + $ticket_template_order = intval($row['ticket_template_order']); $ticket_template_name = nullable_htmlentities($row['ticket_template_name']); $ticket_template_description = nullable_htmlentities($row['ticket_template_description']); $ticket_template_subject = nullable_htmlentities($row['ticket_template_subject']); @@ -151,7 +152,13 @@ if (isset($_GET['project_template_id'])) { ?> - 1 + +
+ + + +
+ diff --git a/database_updates.php b/database_updates.php index 782df28f..895389bc 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1812,10 +1812,16 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.0'"); } - // if (CURRENT_DATABASE_VERSION == '1.2.0') { - // // Insert queries here required to update to DB version 1.2.1 + if (CURRENT_DATABASE_VERSION == '1.2.0') { + mysqli_query($mysqli, "ALTER TABLE `ticket_templates` ADD `ticket_template_order` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_template_details`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.2.1') { + // // Insert queries here required to update to DB version 1.2.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.1"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.2.2"); // } } else { diff --git a/database_version.php b/database_version.php index 8576e65c..86dc2d8f 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", "1.2.0"); +DEFINE("LATEST_DATABASE_VERSION", "1.2.1"); diff --git a/db.sql b/db.sql index 47d7ff82..8872a27d 100644 --- a/db.sql +++ b/db.sql @@ -1630,6 +1630,7 @@ CREATE TABLE `ticket_templates` ( `ticket_template_description` text DEFAULT NULL, `ticket_template_subject` varchar(200) DEFAULT NULL, `ticket_template_details` longtext DEFAULT NULL, + `ticket_template_order` int(11) NOT NULL DEFAULT 0, `ticket_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), `ticket_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `ticket_template_archived_at` datetime DEFAULT NULL, @@ -1882,4 +1883,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-04-04 19:52:07 +-- Dump completed on 2024-04-05 18:19:29 diff --git a/post/admin.php b/post/admin.php index ed64d423..026e1bdd 100644 --- a/post/admin.php +++ b/post/admin.php @@ -42,6 +42,17 @@ if (isset($_POST['edit_project_template'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } +if (isset($_POST['edit_ticket_template_order'])) { + + validateTechRole(); + $ticket_template_id = intval($_POST['ticket_template_id']); + $order = intval($_POST['order']); + + mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_order = $order WHERE ticket_template_id = $ticket_template_id"); + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['add_ticket_template_to_project_template'])) { validateTechRole();