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

Fix nasty bug with deleted vs. includedeleted

Browse Source
This commit is contained in:
phl0
2020-03-05 15:48:50 +01:00
parent 1aa2741351
commit 8cd5c690d6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/Awards.php
View File

@@ -99,7 +99,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = $this->input->post('worked');
$postdata['confirmed'] = $this->input->post('confirmed');
$postdata['notworked'] = $this->input->post('notworked');
$postdata['deleted'] = $this->input->post('deleted');
$postdata['includedeleted'] = $this->input->post('includedeleted');
$postdata['Africa'] = $this->input->post('Africa');
$postdata['Asia'] = $this->input->post('Asia');
$postdata['Europe'] = $this->input->post('Europe');
@@ -115,7 +115,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = 1;
$postdata['confirmed'] = 1;
$postdata['notworked'] = 1;
$postdata['deleted'] = 1;
$postdata['includedeleted'] = 1;
$postdata['Africa'] = 1;
$postdata['Asia'] = 1;
$postdata['Europe'] = 1;
@@ -259,4 +259,4 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
}
}

10
application/models/Dxcc.php
View File

@@ -250,7 +250,7 @@ class DXCC extends CI_Model {
$sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc";
if ($postdata['deleted'] == NULL) {
if ($postdata['includedeleted'] == NULL) {
$sql .= " and dxcc_entities.end is null";
}
@@ -278,7 +278,7 @@ class DXCC extends CI_Model {
$sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc";;
if ($postdata['deleted'] == NULL) {
if ($postdata['includedeleted'] == NULL) {
$sql .= " and dxcc_entities.end is null";
}
@@ -314,7 +314,7 @@ class DXCC extends CI_Model {
$sql .= " where 1 = 1";
if ($postdata['deleted'] == NULL) {
if ($postdata['includedeleted'] == NULL) {
$sql .= " and end is null";
}
@@ -362,7 +362,7 @@ class DXCC extends CI_Model {
) ll on dxcc_entities.adif = ll.col_dxcc
where 1=1";
if ($postdata['deleted'] == 'false') {
if ($postdata['includedeleted'] == 'false') {
$sql .= " and dxcc_entities.end is null";
}
@@ -396,7 +396,7 @@ class DXCC extends CI_Model {
) ll on dxcc_entities.adif = ll.col_dxcc
where 1=1";
if ($postdata['deleted'] == 'false') {
if ($postdata['includedeleted'] == 'false') {
$sql .= " and dxcc_entities.end is null";
}