kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #1243 from Werzi2001/station_logbooks_sort
sort logbook and station list by namepull/1256/head
commit
10969f7572
|
@ -11,6 +11,7 @@ class Logbooks_model extends CI_Model {
|
||||||
|
|
||||||
function show_all() {
|
function show_all() {
|
||||||
$this->db->where('user_id', $this->session->userdata('user_id'));
|
$this->db->where('user_id', $this->session->userdata('user_id'));
|
||||||
|
$this->db->order_by('logbook_name');
|
||||||
return $this->db->get('station_logbooks');
|
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->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->group_by('station_profile.station_id');
|
||||||
$this->db->where('station_profile.user_id', $this->session->userdata('user_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();
|
return $this->db->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue