goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Fix nasty bug with deleted vs. includedeleted

浏览代码
这个提交包含在：
phl0 2020-03-05 15:48:50 +01:00
父节点 1aa2741351
当前提交 8cd5c690d6
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 2 个文件被更改，包括 8 次插入 和 8 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/controllers/Awards.php
查看文件

@ -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
查看文件

@ -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";
}