From 5b648bfd0dabc3d5e4ae7c036167a717609515a3 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 23 Dec 2025 13:10:39 +0100 Subject: [PATCH] Adjusted when checking for dupes on sat --- application/models/Logbookadvanced_model.php | 2 ++ application/views/logbookadvanced/dupesearchdialog.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 80bcb4381..07587cf70 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -4,6 +4,7 @@ use Wavelog\QSLManager\QSO; class Logbookadvanced_model extends CI_Model { public function dupeSearchQuery($searchCriteria, $binding) { + $conditions = []; $group_by_append = ''; $order_by = ''; @@ -21,6 +22,7 @@ class Logbookadvanced_model extends CI_Model { if (isset($searchCriteria['dupesat']) && $searchCriteria['dupesat'] === 'Y') { $id_sql .= ", COL_SAT_NAME"; $group_by_append .= ", COL_SAT_NAME"; + $conditions[] = "COL_PROP_MODE = 'SAT' and COL_SAT_NAME <> '' and COL_SAT_NAME is not null"; } $id_sql .= " from " . $this->config->item('table_name') . " diff --git a/application/views/logbookadvanced/dupesearchdialog.php b/application/views/logbookadvanced/dupesearchdialog.php index c529938f2..464e7b238 100644 --- a/application/views/logbookadvanced/dupesearchdialog.php +++ b/application/views/logbookadvanced/dupesearchdialog.php @@ -36,7 +36,7 @@
- +