kc9uhi/wavelog
3
0
Fork 1
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-28 01:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes (#4)

Browse Source
This commit is contained in:
Fabian Berg
2025-01-30 07:44:48 +01:00
committed by GitHub
parent f7302c341d
commit 0f0af3f466
5 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
application/controllers/User.php
View File

@@ -178,8 +178,8 @@ class User extends CI_Controller {
$data['user_language'] = 'english';
// Values for the "dashboard last QSO count" selectbox
$data['dashboard_last_qso_count_limit'] = \User_Model::DASHBOARD_QSOS_COUNT_LIMIT;
$data['user_dashboard_last_qso_count'] = \User_Model::DASHBOARD_DEFAULT_QSOS_COUNT;
$data['dashboard_last_qso_count_limit'] = DASHBOARD_QSOS_COUNT_LIMIT;
$data['user_dashboard_last_qso_count'] = DASHBOARD_DEFAULT_QSOS_COUNT;
if ($this->form_validation->run() == FALSE) {
$data['page_title'] = __("Add User");
@@ -376,7 +376,7 @@ class User extends CI_Controller {
$data['timezones'] = $this->user_model->timezones();
// Max value to be present in the "dashboard last QSO count" selectbox
$data['dashboard_last_qso_count_limit'] = \User_Model::DASHBOARD_QSOS_COUNT_LIMIT;
$data['dashboard_last_qso_count_limit'] = DASHBOARD_QSOS_COUNT_LIMIT;
$data['page_title'] = __("Edit User");
@@ -757,23 +757,7 @@ class User extends CI_Controller {
$data['user_locations_quickswitch'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'), $this->uri->segment(3))->row()->option_value ?? 'false');
$data['user_utc_headermenu'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'utc_headermenu'), $this->uri->segment(3))->row()->option_value ?? 'false');
if($this->input->post('user_dashboard_last_qso_count', true)) {
$data['user_dashboard_last_qso_count'] = $this->input->post('user_dashboard_last_qso_count', true);
} else {
// Determine last (recent) QSO count to preselect into the selectbox
$last_qso_count_opt = $this->user_options_model->get_options(
'dashboard',
array('option_name' => 'last_qso_count', 'option_key' => 'count'),
$this->uri->segment(3)
)->result();
if (count($last_qso_count_opt) > 0) {
$data['user_dashboard_last_qso_count'] = $last_qso_count_opt[0]->option_value;
} else {
$data['user_dashboard_last_qso_count'] = \User_Model::DASHBOARD_DEFAULT_QSOS_COUNT;
}
}
$data['user_dashboard_last_qso_count'] = ($this->user_options_model->get_options('dashboard', array('option_name'=>'last_qso_count', 'option_key' => 'count'), $this->uri->segment(3))->row()->option_value ?? DASHBOARD_DEFAULT_QSOS_COUNT);
$this->load->view('interface_assets/header', $data);
$this->load->view('user/edit', $data);