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

Merge pull request #1747 from phl0/alsoExportMySotaSummits

浏览代码 
fixes https://github.com/magicbug/Cloudlog/issues/1743
这个提交包含在：
Peter Goodhall 2022-11-08 10:37:38 +00:00 提交者 GitHub
当前提交 07d079bb86
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 1 次插入 和 1 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/models/Csv_model.php
查看文件

@ -23,7 +23,7 @@ class Csv_model extends CI_Model
$sql .= "SELECT station_callsign, COL_MY_SOTA_REF, COL_QSO_DATE, COL_TIME_ON, COL_BAND, COL_MODE, COL_CALL, COL_SOTA_REF, COL_COMMENT $sql .= "SELECT station_callsign, COL_MY_SOTA_REF, COL_QSO_DATE, COL_TIME_ON, COL_BAND, COL_MODE, COL_CALL, COL_SOTA_REF, COL_COMMENT
FROM ".$this->config->item('table_name'). FROM ".$this->config->item('table_name').
" JOIN station_profile on station_profile.station_id = ".$this->config->item('table_name').".station_id". " JOIN station_profile on station_profile.station_id = ".$this->config->item('table_name').".station_id".
" WHERE COL_SOTA_REF <> ''"; " WHERE COL_SOTA_REF <> '' OR COL_MY_SOTA_REF <> ''";
if ($station_id != "All") { if ($station_id != "All") {
$sql .= ' and ' . $this->config->item('table_name'). '.station_id = ' . $station_id; $sql .= ' and ' . $this->config->item('table_name'). '.station_id = ' . $station_id;