Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OQRS] Fix the qso match button

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-08-14 19:30:51 +02:00
parent b13bd6886b
commit 7f56cd68b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/Oqrs_model.php
View File

@@ -603,7 +603,7 @@ class Oqrs_model extends CI_Model {
$this->db->from('oqrs');
$this->db->join('station_profile', 'station_profile.station_id = oqrs.station_id');
$this->db->where('oqrs.id', $oqrsid);
$this->db->where('oqrs.qsoid', 0); // Ensure we are adding a match to an empty qsoid
$this->db->where('oqrs.qsoid IS NULL', null, false); // Ensure we are adding a match to an empty qsoid
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$query = $this->db->get();

2
application/views/oqrs/qsolist.php
View File

@@ -206,7 +206,7 @@ function return_add_print_button($qso_id, $qslsent) {
}
function return_add_match_qso_button($qso_id, $qsoid, $matchqsoid, $oqrsid) {
if ($qso_id != $qsoid && $matchqsoid == 0) return '<button onclick="addQsoMatchToOqrs(\'' . $qso_id . '\', \'' . $oqrsid . '\')" class="btn btn-sm btn-success">' . __("Match QSO") . '</button>';
if ($qso_id != $qsoid && $matchqsoid == null) return '<button onclick="addQsoMatchToOqrs(\'' . $qso_id . '\', \'' . $oqrsid . '\')" class="btn btn-sm btn-success">' . __("Match QSO") . '</button>';
return '';
}