diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 10ee4d0b8..5dbec718d 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1713,7 +1713,7 @@ class Logbook_model extends CI_Model { 'COL_COUNTRY' => $country, 'COL_CONT' => $this->input->post('continent'), 'COL_DXCC' => $dxcc, - 'COL_CQZ' => $this->input->post('cqz'), + 'COL_CQZ' => $this->input->post('cqz') != '' ? $this->input->post('cqz') : null, 'COL_ITUZ' => $this->input->post('ituz') != '' ? $this->input->post('ituz') : null, 'COL_SAT_NAME' => $this->input->post('sat_name'), 'COL_SAT_MODE' => $this->input->post('sat_mode'), diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 3e7da7e40..435467741 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -897,6 +897,10 @@ class Logbookadvanced_model extends CI_Model { $updatedData['COL_ITUZ'] = $callbook['ituz']; $updated = true; } + if (!empty($callbook['cqz']) && empty($qso['COL_CQZ'])) { + $updatedData['COL_CQZ'] = $callbook['cqz']; + $updated = true; + } if (empty($qso['COL_CONT'])) { $updatedData['COL_CONT'] = $this->logbook_model->getContinent($callbook['dxcc']); $updated = true; @@ -1328,6 +1332,10 @@ class Logbookadvanced_model extends CI_Model { $skipqrzupdate = true; } else { + if ($value == "null") { + $value = null; + } + $sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ".$this->config->item('table_name').".station_id = station_profile.station_id SET " . $this->config->item('table_name').".".$column . " = ? WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?"; $query = $this->db->query($sql, array($value, json_decode($ids, true), $this->session->userdata('user_id'))); diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php index c1226db98..f32feee03 100644 --- a/application/views/logbookadvanced/edit.php +++ b/application/views/logbookadvanced/edit.php @@ -62,6 +62,7 @@ + ' . $i . ''; diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index fbd2d5c9a..ce378f30a 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -307,7 +307,8 @@