mirror/Huntarr-Sonarr
1
0
Fork 0
mirror of https://github.com/plexguide/Huntarr-Sonarr.git synced 2025-12-16 20:04:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enhance notification settings handling in forms

Browse Source 
- Updated input retrieval logic to check both the main container and the notifications container for notification settings.
- Introduced a helper function to streamline the process of getting input values, improving code clarity and maintainability.
- Ensured that apprise URLs are processed from the correct container, enhancing the robustness of the settings form functionality.
This commit is contained in:
Admin9705
2025-06-26 08:33:01 -04:00
parent 613f969b05
commit 66c8954dac
2 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/static/js/new-main.js
View File

@@ -1384,9 +1384,15 @@ let huntarrUI = {
const globalAppriseElement = document.querySelector('#apprise_urls');
console.log('[huntarrUI] Global apprise_urls element:', globalAppriseElement);
// Get all inputs and select elements in the general form
const inputs = form.querySelectorAll('input, select, textarea');
inputs.forEach(input => {
// Get all inputs and select elements in the general form AND notifications container
const generalInputs = form.querySelectorAll('input, select, textarea');
const notificationsContainer = document.querySelector('#notificationsContainer');
const notificationInputs = notificationsContainer ? notificationsContainer.querySelectorAll('input, select, textarea') : [];
// Combine inputs from both containers
const allInputs = [...generalInputs, ...notificationInputs];
allInputs.forEach(input => {
let key = input.id;
let value;

47
frontend/static/js/settings_forms.js
View File

@@ -2426,13 +2426,40 @@ const SettingsForms = {
settings.log_refresh_interval_seconds = getInputValue('#log_refresh_interval_seconds', 30);
settings.base_url = getInputValue('#base_url', '');
// Notification settings
settings.enable_notifications = getInputValue('#enable_notifications', false);
settings.notification_level = container.querySelector('#notification_level')?.value || 'info';
// Notification settings - check both container and notifications container
const notificationsContainer = document.querySelector('#notificationsContainer');
// Process apprise URLs (split by newline)
const appriseUrlsElement = container.querySelector('#apprise_urls');
console.log('Container apprise_urls element found:', appriseUrlsElement);
// Helper function to get input value from either container
const getNotificationInputValue = (id, defaultValue) => {
let element = container.querySelector(id);
if (!element && notificationsContainer) {
element = notificationsContainer.querySelector(id);
}
if (!element) {
console.log(`Notification element ${id} not found in either container`);
return defaultValue;
}
if (element.type === 'checkbox') {
return element.checked;
} else if (element.type === 'number') {
const value = parseInt(element.value, 10);
return isNaN(value) ? defaultValue : value;
} else {
return element.value || defaultValue;
}
};
settings.enable_notifications = getNotificationInputValue('#enable_notifications', false);
settings.notification_level = getNotificationInputValue('#notification_level', 'info');
// Process apprise URLs (split by newline) - check notifications container first
let appriseUrlsElement = notificationsContainer ? notificationsContainer.querySelector('#apprise_urls') : null;
if (!appriseUrlsElement) {
appriseUrlsElement = container.querySelector('#apprise_urls');
}
console.log('Apprise URLs element found:', appriseUrlsElement);
const appriseUrlsText = appriseUrlsElement?.value || '';
console.log('Apprise URLs raw text:', appriseUrlsText);
settings.apprise_urls = appriseUrlsText.split('\n')
@@ -2440,10 +2467,10 @@ const SettingsForms = {
.filter(url => url.length > 0);
console.log('Apprise URLs processed:', settings.apprise_urls);
settings.notify_on_missing = getInputValue('#notify_on_missing', true);
settings.notify_on_upgrade = getInputValue('#notify_on_upgrade', true);
settings.notification_include_instance = getInputValue('#notification_include_instance', true);
settings.notification_include_app = getInputValue('#notification_include_app', true);
settings.notify_on_missing = getNotificationInputValue('#notify_on_missing', true);
settings.notify_on_upgrade = getNotificationInputValue('#notify_on_upgrade', true);
settings.notification_include_instance = getNotificationInputValue('#notification_include_instance', true);
settings.notification_include_app = getNotificationInputValue('#notification_include_app', true);
// Handle the auth_mode dropdown
const authMode = container.querySelector('#auth_mode')?.value || 'login';