Merge pull request #57 from phl0/emptyConfirmations

Show all unconfirmed if no QSL method is selected
This commit is contained in:
Florian (DF2ET)
2024-01-31 12:34:03 +01:00
committed by GitHub
2 changed files with 6 additions and 2 deletions

View File

@@ -173,7 +173,7 @@ class Gridmap extends CI_Controller {
}
}
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
$data['grid_4char_confirmed'] = ($array_grid_4char_confirmed);
$data['grid_6char_confirmed'] = ($array_grid_6char_confirmed);

View File

@@ -129,6 +129,7 @@ class Gridmap_model extends CI_Model {
return null;
}
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM '
@@ -177,7 +178,10 @@ class Gridmap_model extends CI_Model {
$sql .= " or col_qrzcom_qso_download_status = 'Y'";
}
if ($sql != '') {
$sql='and (1=0 '.$sql.')';
$sql=' and (1=0 '.$sql.')';
}
if ($sql == '') {
$sql=' and 1=0';
}
return $sql;
}