Merge pull request #1470 from Werzi2001/sort_locations_by_id

added possibility to sort locations by id
这个提交包含在:
Peter Goodhall 2022-05-05 14:22:34 +01:00 提交者 GitHub
当前提交 5713cb4259
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 1 次插入3 次删除

查看文件

@ -4,7 +4,6 @@ class Logbooks_model extends CI_Model {
function show_all() {
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->order_by('logbook_name');
return $this->db->get('station_logbooks');
}

查看文件

@ -10,7 +10,6 @@ class Stations extends CI_Model {
$this->db->group_by('station_profile.station_id');
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$this->db->or_where('station_profile.user_id =', NULL);
$this->db->order_by('station_profile.station_profile_name');
return $this->db->get();
}

查看文件

@ -60,7 +60,7 @@
<td><?php echo $row->station_callsign;?></td>
<td><?php echo $row->station_country;?></td>
<td><?php echo $row->station_gridsquare;?></td>
<td style="text-align: center">
<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
<?php if($row->station_active != 1) { ?>
<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make station <?php echo $row->station_profile_name; ?> the active station?');">Set Active</a>
<?php } else { ?>