Merge pull request #1243 from Werzi2001/station_logbooks_sort

sort logbook and station list by name
这个提交包含在:
Andreas Kristiansen 2021-10-22 14:53:44 +02:00 提交者 GitHub
当前提交 10969f7572
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 3 次插入1 次删除

查看文件

@ -11,6 +11,7 @@ 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');
}

查看文件

@ -15,7 +15,8 @@ class Stations extends CI_Model {
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left');
$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->or_where('station_profile.user_id =', NULL);
$this->db->order_by('station_profile.station_profile_name');
return $this->db->get();
}