kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #1959 from magicbug/dev
Fixes issue with dashboard dates being out of orderpull/2056/head
commit
ef143e1620
|
@ -1113,6 +1113,7 @@ class Logbook_model extends CI_Model {
|
|||
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
|
||||
$this->db->where_in('station_profile.station_id', $logbooks_locations_array);
|
||||
$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
|
||||
$this->db->order_by(''.$this->config->item('table_name').'.COL_PRIMARY_KEY', "desc");
|
||||
|
||||
$this->db->limit($num);
|
||||
$this->db->offset($offset);
|
||||
|
@ -1179,11 +1180,12 @@ class Logbook_model extends CI_Model {
|
|||
|
||||
$sql = "SELECT * FROM ( select * from " . $this->config->item('table_name'). "
|
||||
WHERE station_id IN(". $location_list .")
|
||||
order by col_time_on desc
|
||||
order by col_time_on desc, col_primary_key desc
|
||||
limit " . $num .
|
||||
") hrd
|
||||
JOIN station_profile ON station_profile.station_id = hrd.station_id
|
||||
LEFT JOIN dxcc_entities ON hrd.col_dxcc = dxcc_entities.adif";
|
||||
LEFT JOIN dxcc_entities ON hrd.col_dxcc = dxcc_entities.adif
|
||||
order by col_time_on desc, col_primary_key desc";
|
||||
|
||||
$query = $this->db->query($sql);
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ class Logbookadvanced_model extends CI_Model {
|
|||
INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
|
||||
WHERE station_profile.user_id = ?
|
||||
$where
|
||||
ORDER BY qsos.COL_TIME_ON desc
|
||||
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc
|
||||
LIMIT $limit
|
||||
";
|
||||
|
||||
|
@ -217,4 +217,4 @@ class Logbookadvanced_model extends CI_Model {
|
|||
|
||||
return $modes;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue