From bf24cff4aa28e862b40c3915d4c8bb7c6e6cb499 Mon Sep 17 00:00:00 2001 From: Jeremy Brown Date: Sat, 14 Nov 2020 15:40:22 -0500 Subject: [PATCH] Fix for #2, if dxcc info is not in the adif, and the user wants to get it from the adif, we will still look it up if it's not included. --- application/models/Logbook_model.php | 2 +- application/views/adif/import.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index aba5184c..4ac8ab79 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1525,7 +1525,7 @@ class Logbook_model extends CI_Model { $entity = $this->get_entity($record['dxcc']); $dxcc = array($record['dxcc'], $entity['name']); } else { - $dxcc = NULL; + $dxcc = $this->check_dxcc_table($record['call'], $time_off); } } else { $dxcc = $this->check_dxcc_table($record['call'], $time_off); diff --git a/application/views/adif/import.php b/application/views/adif/import.php index 7f56d40e..56f26899 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -53,7 +53,8 @@ -
If not selected, Cloudlog will attempt to determine DXCC information automatically.
+
If not selected, Cloudlog will attempt to determine DXCC information automatically.
+ If selected, we will import from ADIF, but determine if not included in entries.