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

Add deleted DXCC badge to linked station profiles

浏览代码
这个提交包含在：
phl0 2023-04-27 09:47:09 +02:00
父节点 90f64e6d7a
当前提交 fc12664da8
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 2 个文件被更改，包括 3 次插入 和 3 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

4
application/models/Logbooks_model.php
查看文件

@ -262,9 +262,9 @@ class Logbooks_model extends CI_Model {
array_push($relationships_array, $row->station_location_id); array_push($relationships_array, $row->station_location_id);
} }
$this->db->select('station_profile.*, dxcc_entities.name as station_country'); $this->db->select('station_profile.*, dxcc_entities.name as station_country, dxcc_entities.end as end');
$this->db->where_in('station_id', $relationships_array); $this->db->where_in('station_id', $relationships_array);
$this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left'); $this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left outer');
$query = $this->db->get('station_profile'); $query = $this->db->get('station_profile');
return $query; return $query;

2
application/views/logbooks/edit.php
查看文件

@ -129,7 +129,7 @@
foreach ($station_locations_linked->result() as $row) { foreach ($station_locations_linked->result() as $row) {
?> ?>
<tr> <tr>
<td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country;?>)</td> <td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
<td><a href="<?php echo site_url('logbooks/delete_relationship/'); ?><?php echo $station_logbook_details->logbook_id; ?>/<?php echo $row->station_id;?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a></td> <td><a href="<?php echo site_url('logbooks/delete_relationship/'); ?><?php echo $station_logbook_details->logbook_id; ?>/<?php echo $row->station_id;?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a></td>
</tr> </tr>
<?php <?php