Add deleted DXCC badge to linked station profiles
这个提交包含在:
父节点
90f64e6d7a
当前提交
fc12664da8
共有 2 个文件被更改,包括 3 次插入 和 3 次删除
|
|
@ -262,9 +262,9 @@ class Logbooks_model extends CI_Model {
|
|||
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->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');
|
||||
|
||||
return $query;
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
foreach ($station_locations_linked->result() as $row) {
|
||||
?>
|
||||
<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>
|
||||
</tr>
|
||||
<?php
|
||||
|
|
|
|||
正在加载…
在新工单中引用