From cc4ceb183f56cdcfdaaabceac65f0ec60a30ceee Mon Sep 17 00:00:00 2001
From: Patrick Fairbank <patfair@gmail.com>
Date: Tue, 3 Oct 2023 20:49:05 -0700
Subject: [PATCH] Fix bug with lower third ordering getting messed up if edited
 by multiple users without refreshing.

---
 static/js/lower_thirds.js         | 2 +-
 templates/setup_lower_thirds.html | 2 --
 web/setup_lower_thirds.go         | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/static/js/lower_thirds.js b/static/js/lower_thirds.js
index 127a5eb7..2f537dd4 100644
--- a/static/js/lower_thirds.js
+++ b/static/js/lower_thirds.js
@@ -33,7 +33,7 @@ var reorderLowerThird = function(button, moveUp) {
 // Gathers the lower third info and constructs a JSON object.
 var constructLowerThird = function(button) {
   return { Id: parseInt(button.form.id.value), TopText: button.form.topText.value,
-      BottomText: button.form.bottomText.value, DisplayOrder: parseInt(button.form.displayOrder.value) }
+      BottomText: button.form.bottomText.value }
 };
 
 $(function() {
diff --git a/templates/setup_lower_thirds.html b/templates/setup_lower_thirds.html
index bbb5a2d7..a1374068 100644
--- a/templates/setup_lower_thirds.html
+++ b/templates/setup_lower_thirds.html
@@ -19,7 +19,6 @@
                   placeholder="Top Text"/>
               <input type="text" class="form-control" name="bottomText" value="{{$lowerThird.BottomText}}"
                   placeholder="Bottom Text"/>
-              <input type="hidden" name="displayOrder" value="{{$i}}" />
             </div>
             <div class="col-lg-6">
               <button type="button" class="btn btn-info btn-lower-third" onclick="saveLowerThird(this);">
@@ -51,7 +50,6 @@
             <input type="hidden" name="id" value="0" />
             <input type="text" class="form-control" name="topText" placeholder="Top or Solo Text" />
             <input type="text" class="form-control" name="bottomText" placeholder="Bottom Text" />
-            <input type="hidden" name="displayOrder" value="{{len .LowerThirds}}" />
           </div>
           <div class="col-lg-6">
             <button type="button" class="btn btn-info btn-lower-third" name="save" onclick="saveLowerThird(this);">
diff --git a/web/setup_lower_thirds.go b/web/setup_lower_thirds.go
index 9438bbe1..94a85043 100644
--- a/web/setup_lower_thirds.go
+++ b/web/setup_lower_thirds.go
@@ -151,6 +151,7 @@ func (web *Web) saveLowerThird(lowerThird *model.LowerThird) error {
 		lowerThird.DisplayOrder = web.arena.Database.GetNextLowerThirdDisplayOrder()
 		err = web.arena.Database.CreateLowerThird(lowerThird)
 	} else {
+		lowerThird.DisplayOrder = oldLowerThird.DisplayOrder
 		err = web.arena.Database.UpdateLowerThird(lowerThird)
 	}
 	if err != nil {