mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Use the value from settings in the UI
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
|
||||
class QSO extends CI_Controller {
|
||||
|
||||
const LAST_QSOS_COUNT = 5; // max number of most recent qsos to be displayed on a qso page
|
||||
|
||||
function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->load->model('user_model');
|
||||
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
|
||||
$this->session->set_userdata('last_qsos_count', self::LAST_QSOS_COUNT);
|
||||
|
||||
$last_qso_count = empty($this->session->userdata('qso_page_last_qso_count')) ? QSO_PAGE_DEFAULT_QSOS_COUNT : $this->session->userdata('qso_page_last_qso_count');
|
||||
$this->session->set_userdata('qso_page_last_qso_count', $last_qso_count);
|
||||
}
|
||||
|
||||
public function index() {
|
||||
@@ -37,7 +37,7 @@ class QSO extends CI_Controller {
|
||||
$data['stations'] = $this->stations->all_of_user();
|
||||
$data['radios'] = $this->cat->radios(true);
|
||||
$data['radio_last_updated'] = $this->cat->last_updated()->row();
|
||||
$data['query'] = $this->logbook_model->last_custom($this->session->userdata('last_qsos_count'));
|
||||
$data['query'] = $this->logbook_model->last_custom($this->session->userdata('qso_page_last_qso_count'));
|
||||
$data['dxcc'] = $this->logbook_model->fetchDxcc();
|
||||
$data['iota'] = $this->logbook_model->fetchIota();
|
||||
$data['modes'] = $this->modes->active();
|
||||
@@ -87,7 +87,7 @@ class QSO extends CI_Controller {
|
||||
$data['user_dok_to_qso_tab'] = 0;
|
||||
}
|
||||
|
||||
$data['qso_count'] = $this->session->userdata('last_qsos_count');
|
||||
$data['qso_count'] = $this->session->userdata('qso_page_last_qso_count');
|
||||
|
||||
$this->load->library('form_validation');
|
||||
|
||||
@@ -606,7 +606,7 @@ class QSO extends CI_Controller {
|
||||
$this->load->model('logbook_model');
|
||||
session_write_close();
|
||||
|
||||
$data['query'] = $this->logbook_model->last_custom($this->session->userdata('last_qsos_count'));
|
||||
$data['query'] = $this->logbook_model->last_custom($this->session->userdata('qso_page_last_qso_count'));
|
||||
|
||||
// Load view
|
||||
$this->load->view('qso/components/previous_contacts', $data);
|
||||
|
||||
Reference in New Issue
Block a user