Merge pull request #1690 from magicbug/master

application/controllers/Logbooks.php

@@ -154,8 +154,17 @@ class Logbooks extends CI_Controller {
 				echo "<div class=\"alert alert-danger\" role=\"alert\">Oops! This Public Slug is unavailable</div>";
 			}
 		}
-		
 	}
 
+	public function remove_publicslug() {
+		$this->load->model('logbooks_model');
+
+		$this->logbooks_model->remove_public_slug($this->input->post('logbook_id'));
+		if ($this->db->affected_rows() > 0) {
+			echo "<div class=\"alert alert-success\" role=\"alert\">Public Slug Removed</div>";
+		} else {
+			echo "<div class=\"alert alert-danger\" role=\"alert\">Oops! This Public Slug could not be removed</div>";
+		}
+	}
 
 }

application/models/Logbooks_model.php

@@ -220,6 +220,14 @@ class Logbooks_model extends CI_Model {
 		$this->db->update('station_logbooks', $data);
 	}
 
+	function remove_public_slug($logbook_id) {
+
+		$this->db->set('public_slug', null);
+		$this->db->where('user_id', $this->session->userdata('user_id'));
+		$this->db->where('logbook_id', xss_clean($logbook_id));
+		$this->db->update('station_logbooks');
+	}
+
 	function list_logbook_relationships($logbook_id) {
 
 		$relationships_array = array();

application/views/interface_assets/footer.php

@@ -63,6 +63,18 @@ function load_was_map() {
     <script src="<?php echo base_url() ;?>assets/js/sections/notes.js"></script>
 <?php } ?>
 
+<?php if ($this->uri->segment(1) == "logbooks" && $this->uri->segment(2) == "edit") { ?>
+<script>
+    function removeSlug() {
+        var slugLink = document.getElementById("slugLink");
+        if (slugLink !== null) {
+            slugLink.style.display = "none";
+        }
+        document.getElementById('publicSlugInput').value = ''
+    }
+</script>
+<?php } ?>
+
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datatables.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/dataTables.buttons.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/buttons.html5.min.js"></script>

application/views/logbooks/edit.php

@@ -46,7 +46,7 @@
 				<div class="card-body">
 					<p>Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only.</p>
 					
-					<form hx-post="<?php echo site_url('logbooks/save_publicslug/'); ?>" hx-target="#publicSlugForm">
+					<form hx-post="<?php echo site_url('logbooks/save_publicslug/'); ?>" hx-target="#publicSlugForm" style="display: inline;">
 					<div id="publicSlugForm">
 					</div>
 					<div class="form-group">
@@ -56,11 +56,15 @@
 							<input class="form-control" name="public_slug" id="publicSlugInput" pattern="[a-zA-Z0-9-]+" value="<?php echo $station_logbook_details->public_slug; ?>" hx-post="<?php echo site_url('logbooks/publicslug_validate/'); ?>"  hx-trigger="keyup changed delay:500ms" required>
 						</div>
 					</div>
-					<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> Save</button>
+					<button type="submit" class="btn btn-primary" style="display:inline-block;"><i class="fas fa-plus-square"></i> Save</button>
+					</form>
+					<form hx-post="<?php echo site_url('logbooks/remove_publicslug/'); ?>" hx-target="#publicSlugForm" style="display: inline; margin-left: 5px;">
+						<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
+						<button type="submit" class="btn btn-primary" style="display:inline-block;" onclick="removeSlug()"><i class="fas fa-minus-square"></i> Remove</button>
 					</form>
 
 					<?php if($station_logbook_details->public_slug != "") { ?>
-					<div class="alert alert-info" role="alert" style="margin-top: 20px;">
+					<div id="slugLink" class="alert alert-info" role="alert" style="margin-top: 20px;">
 						Visit Public Page <a href="<?php echo site_url('visitor'); ?>/<?php echo $station_logbook_details->public_slug; ?>" target="_blank"><?php echo site_url('visitor'); ?>/<?php echo $station_logbook_details->public_slug; ?></a>
 					</div>
 					<?php } ?>

application/views/qso/edit_ajax.php

@@ -530,7 +530,7 @@
                                 <?php
                                 $CI =& get_instance();
                                 $CI->load->model('stations');
-                                $my_stations = $CI->stations->all();
+                                $my_stations = $CI->stations->all_of_user();
                                 ?>
 
                                 <div class="form-group">