From ef5ea4498dec612c060fca1e79301ed383d4f73a Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 13 Jan 2024 11:30:53 +0000 Subject: [PATCH] Removed Bug at clublog-model where OR wasn't grouped --- application/models/Clublog_model.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/application/models/Clublog_model.php b/application/models/Clublog_model.php index 009b54124..f9d8bc38c 100644 --- a/application/models/Clublog_model.php +++ b/application/models/Clublog_model.php @@ -24,10 +24,12 @@ class Clublog_model extends CI_Model { ); $this->db->where("station_id", $station_id); + $this->db->group_start(); $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "M"); + $this->db->group_end(); $this->db->update($this->config->item('table_name'), $data); } @@ -43,13 +45,15 @@ class Clublog_model extends CI_Model { function get_last_five($station_id) { $this->db->where('station_id', $station_id); - $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); - $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); - $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); - $this->db->limit(5); - $query = $this->db->get($this->config->item('table_name')); + $this->db->group_start(); + $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); + $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); + $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); + $this->db->group_end(); + $this->db->limit(5); + $query = $this->db->get($this->config->item('table_name')); - return $query; + return $query; } function mark_all_qsos_notsent($station_id) {