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

Merge remote-tracking branch 'upstream/dev' into bootstrap_5

浏览代码
这个提交包含在：
HB9HIL 2023-11-17 08:35:17 +01:00
当前提交 17f39639be
共有 2 个文件被更改，包括 2 次插入 和 1 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
application/models/Logbook_model.php
查看文件

@ -500,6 +500,7 @@ class Logbook_model extends CI_Model {
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer');
$this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer');
$this->db->where('COL_CALL', $call); $this->db->where('COL_CALL', $call);
if ($band != 'All') { if ($band != 'All') {
if ($band == 'SAT') { if ($band == 'SAT') {

2
application/views/view_log/partial/log_ajax.php
查看文件

@ -102,7 +102,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<td> <td>
<a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a> <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
<?php <?php
if ($row->lastupload) { if (isset($row->lastupload) && ($row->lastupload)) {
$lotw_hint = ''; $lotw_hint = '';
$diff = (time() - strtotime($row->lastupload)) / 86400; $diff = (time() - strtotime($row->lastupload)) / 86400;
if ($diff > 365) { if ($diff > 365) {