From 5e24d4c5daff7f3db12a90594b9ad56e136fc374 Mon Sep 17 00:00:00 2001
From: samilliken <scott@themillikens.com>
Date: Sun, 15 Oct 2023 08:25:10 -0400
Subject: [PATCH] Updated CHANGELOG and installers for 23.04 release

---
 CHANGELOG             | 10 ++++++++++
 container-install.php |  6 ++++++
 db-23.03-to-23.04.sql |  5 +++++
 install.php           |  5 +++++
 version.php           |  2 +-
 5 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100755 db-23.03-to-23.04.sql

diff --git a/CHANGELOG b/CHANGELOG
index bf08f9380..925521d74 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,16 @@ GitHub, at http://github.com/opendcim/openDCIM/issues, where you can also downlo
 the latest development version.  However, it is not advised to pull from GitHub unless you
 are simply testing, as some functionality can break between releases.
 
+Changes in 23.04
+----------------
+* Resolved UI issue with patch panel entry deletions
+* Resolved UI issue with patch panel editing
+* Corrected SQL in in new installs where admin user was not being created
+* Resolved issue where items that were disposed, then moved back to production, they could not be disposed again
+* Resolved UI issue where image could not be selected for template
+* Resolved some missed API routes causing images to not display in cabinets
+* Resolved issue with Outage Simulator Report when selecting subpanels
+
 Changes in 23.03
 ----------------
 * Resolved error in bulk_network.php
diff --git a/container-install.php b/container-install.php
index 0dbd18d64..0acfc3162 100644
--- a/container-install.php
+++ b/container-install.php
@@ -234,6 +234,12 @@ function upgrade(){
         error_log("Applying database update from 23.02 to 23.03");
         $results[]=applyupdate("db-23.02-to-23.03.sql");
 
+        $config->rebuild();
+    }
+	if($version=="23.03"){
+        error_log("Applying database update from 23.03 to 23.04");
+        $results[]=applyupdate("db-23.03-to-23.04.sql");
+
         $config->rebuild();
     }
 }
diff --git a/db-23.03-to-23.04.sql b/db-23.03-to-23.04.sql
new file mode 100755
index 000000000..1863fb920
--- /dev/null
+++ b/db-23.03-to-23.04.sql
@@ -0,0 +1,5 @@
+---
+--- Schema changes for 23.03 to 23.04
+---
+
+UPDATE fac_Config set Value="23.04" WHERE Parameter="Version";
diff --git a/install.php b/install.php
index b26809274..05b4ac6f1 100644
--- a/install.php
+++ b/install.php
@@ -236,7 +236,12 @@ function upgrade(){
 
                 $config->rebuild();
         }
+        if($version=="23.03"){
+                error_log("Applying database update from 23.03 to 23.04");
+                $results[]=applyupdate("db-23.03-to-23.04.sql");
 
+                $config->rebuild();
+        }
 }
 
 	if($upgrade==true){ //If we're doing an upgrade don't call the rest of the installer.
diff --git a/version.php b/version.php
index ba7003d8b..6b98d0a8f 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-	define( "VERSION", "23.03" );
+	define( "VERSION", "23.04" );
 ?>