From 349f3ee1ca893a5905b6f660e6168a5d892bf151 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 6 Oct 2021 20:24:14 +0200
Subject: [PATCH] [Contesting names] Bugfix in the form for creating contests
 and stopped loading of contesting.js when editing contestnames.

---
 application/views/contesting/create.php       | 4 ++--
 application/views/interface_assets/footer.php | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/views/contesting/create.php b/application/views/contesting/create.php
index 5437fa4d..4a0bd5ee 100644
--- a/application/views/contesting/create.php
+++ b/application/views/contesting/create.php
@@ -19,7 +19,7 @@
 
 		<?php echo validation_errors(); ?>
 
-		<form method="post" name="create_profile">
+		<form>
 		<div class="form-group">
 		    <label for="contestInput">Contest Name</label>
 		    <input type="text" class="form-control" name="contestname" id="contestInput" aria-describedby="contestInputHelp" required>
@@ -32,7 +32,7 @@
 		    <small id="adifcontestInputHelp" class="form-text text-muted">Name of Contest in ADIF-specification</small>
 		  </div>
 
-			<button onclick="createContest(this.form);" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> Create Contest</button>
+			<button type="button" onclick="createContest(this.form);" class="btn btn-primary btn-sm"><i class="fas fa-plus-square"></i> Create Contest</button>
 
 		</form>
 </div>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index ad80d4b1..50778f32 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -853,7 +853,7 @@ $(document).on('keypress',function(e) {
   </script>
 
 <?php } ?>
-<?php if ( ($this->uri->segment(1) == "qso" && $_GET['manual'] == 0) || $this->uri->segment(1) == "contesting") { ?>
+<?php if ( ($this->uri->segment(1) == "qso" && $_GET['manual'] == 0) || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
     <script>
     function setRst(mode) {
         if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){
@@ -871,8 +871,7 @@ $(document).on('keypress',function(e) {
         }
     }
     </script>
-<?php } ?>
-<?php if ( ($this->uri->segment(1) == "qso" && $_GET['manual'] == 0) || $this->uri->segment(1) == "contesting") { ?>
+
     <script>
         // Javascript for controlling rig frequency.
   var updateFromCAT = function() {
@@ -1975,7 +1974,7 @@ function deleteQsl(id) {
 		});
 	}
 </script>
-<?php if ($this->uri->segment(1) == "contesting") { ?>
+<?php if ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add" ) { ?>
     <script src="<?php echo base_url() ;?>assets/js/sections/contesting.js"></script>
 <?php } ?>