goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Revert "Simplify state handling for station profiles"

浏览代码 
This reverts commit 33ec51d7d5.
这个提交包含在：
Peter Goodhall 2025-08-02 11:27:41 +01:00
父节点 33ec51d7d5
当前提交 370daa3e55
共有 2 个文件被更改，包括 18 次插入 和 21 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

22
application/models/Stations.php
查看文件

@ -75,8 +75,12 @@ class Stations extends CI_Model {
$station_active = 1;
}
// Get the state value from the form
$state = xss_clean($this->input->post('station_state', true));
// Check if the state is Canada and get the correct state
if ($this->input->post('dxcc') == 1 && $this->input->post('station_ca_state') !="") {
$state = xss_clean($this->input->post('station_ca_state', true));
} else {
$state = xss_clean($this->input->post('station_state', true));
}
// Create data array with field values
$data = array(
@ -125,10 +129,16 @@ class Stations extends CI_Model {
function edit() {
// Get the state value from the form
$state = xss_clean($this->input->post('station_state', true));
log_message('error', 'State value: ' . $state);
// Check if the state is Canada and get the correct state
if ($this->input->post('dxcc') == 1 && $this->input->post('station_ca_state') !="") {
$state = xss_clean($this->input->post('station_ca_state', true));
} else {
$state = xss_clean($this->input->post('station_state', true));
// log as an error the value of state
log_message('error', 'State value: ' . $state);
}
log_message('error', 'State value: ' . $this->input->post('station_state', true));
$data = array(
'station_profile_name' => xss_clean($this->input->post('station_profile_name', true)),

17
assets/js/sections/station_locations.js
查看文件

@ -45,8 +45,7 @@ $(document).ready( function () {
};
// Hide all states initially
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
/**
* Gets the selected DXCC ID and shows the corresponding state.
*/
@ -70,21 +69,9 @@ $(document).ready( function () {
var stateToShow = stateMap[selectedValue] || stateMap['default'];
// Hide all states
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
// Show the selected state
$("#" + stateToShow).show();
});
/**
* Form submission handler to ensure only visible state value is submitted
*/
$('form[name="create_profile"]').on('submit', function() {
// Clear all hidden state dropdown values before submission
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").each(function() {
if ($(this).is(':hidden')) {
$(this).find('select[name="station_state"]').val('');
}
});
});
} );