Merge pull request #1952 from magicbug/dev

Cloudlog 2.3.3 Restores the ability to delete a QSO
magicbug · Jan 25, 2023 · bfa4851 · bfa4851
2 parents 53dff31 + 27ac864
commit bfa4851
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
@@ -1,3 +1,14 @@
+<script type="text/javascript">
+  /*
+  *
+  * Define global javascript variables
+  *
+  */
+  var base_url = "<?php echo base_url(); ?>"; // Base URL
+  var site_url = "<?php echo site_url(); ?>"; // Site URL
+  var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
+</script>
+
 <!-- General JS Files used across Cloudlog -->
 <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
 <script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
@@ -18,17 +29,6 @@
 
 <script src="https://unpkg.com/htmx.org@1.6.1"></script>
 
-<script type="text/javascript">
-  /*
-  *
-  * Define global javascript variables
-  *
-  */
-  var base_url = "<?php echo base_url(); ?>"; // Base URL
-  var site_url = "<?php echo site_url(); ?>"; // Site URL
-  var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
-</script>
-
 <?php if ($this->uri->segment(1) == "awards" && ($this->uri->segment(2) == "was") ) { ?>
 <script>
 function load_was_map() {

diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
@@ -88,7 +88,6 @@ function qso_delete(id, call) {
             if(result) {
                 $(".edit-dialog").modal('hide');
                 $(".qso-dialog").modal('hide');
-                var base_url= "<?php echo base_url();?>";
                 $.ajax({
                     url: base_url + 'index.php/qso/delete_ajax',
                     type: 'post',