vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

test button settings fixes

Browse Source
This commit is contained in:
Jokob-sk
2023-08-23 17:01:34 +10:00
parent 20986852de
commit 64c3de0450
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front/settings.php
View File

@@ -353,6 +353,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
const eventsList = createArray(set['Events']); const eventsList = createArray(set['Events']);
if (eventsList.length > 0) { if (eventsList.length > 0) {
console.log(eventsList)
eventsList.forEach(event => { eventsList.forEach(event => {
eventsHtml += `<span class="input-group-addon pointer" eventsHtml += `<span class="input-group-addon pointer"
data-myparam="${codeName}" data-myparam="${codeName}"

13
pialert/initialise.py
View File

@@ -39,14 +39,15 @@ def ccd(key, default, config_dir, name, inputtype, options, group, events=[], de
result = result.replace('\'', "{s-quote}") result = result.replace('\'', "{s-quote}")
conf.mySettingsSQLsafe.append((key, name, desc, inputtype, options, regex, str(result), group, str(events))) conf.mySettingsSQLsafe.append((key, name, desc, inputtype, options, regex, str(result), group, str(events)))
conf.mySettings.append((key, name, desc, inputtype, options, regex, result, group, str(events)))
# save metadata in dummy setting # save metadata in dummy setting
if '__metadata' not in key: if '__metadata' not in key:
conf.mySettingsSQLsafe.append((f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, '')) tuple = (f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, '[]')
conf.mySettingsSQLsafe.append(tuple)
conf.mySettings.append((key, name, desc, inputtype, options, regex, result, group, str(events))) conf.mySettings.append(tuple)
# save metadata in dummy setting
if '__metadata' not in key:
conf.mySettings.append((f'{key}__metadata', "metadata name", "metadata desc", 'json', "", "", json.dumps(setJsonMetadata), group, ''))
return result return result
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

13
pialert/reporting.py
View File

@@ -543,16 +543,19 @@ def handle_test(testType):
sample_json_payload = json.loads(get_file_content(pialertPath + '/back/webhook_json_sample.json'))[0]["body"]["attachments"][0]["text"] sample_json_payload = json.loads(get_file_content(pialertPath + '/back/webhook_json_sample.json'))[0]["body"]["attachments"][0]["text"]
sample_msg = noti_struc(sample_json_payload, sample_txt, sample_html ) sample_msg = noti_struc(sample_json_payload, sample_txt, sample_html )
if testType == 'REPORT_MAIL': if testType == 'Email':
send_email(sample_msg) send_email(sample_msg)
if testType == 'REPORT_WEBHOOK': elif testType == 'Webhooks':
send_webhook (sample_msg) send_webhook (sample_msg)
if testType == 'REPORT_APPRISE': elif testType == 'Apprise':
send_apprise (sample_msg) send_apprise (sample_msg)
if testType == 'REPORT_NTFY': elif testType == 'NTFY':
send_ntfy (sample_msg) send_ntfy (sample_msg)
if testType == 'REPORT_PUSHSAFER': elif testType == 'PUSHSAFER':
send_pushsafer (sample_msg) send_pushsafer (sample_msg)
else:
mylog('none', ['[Test Publishers] No test matches: ', testType])
mylog('minimal', ['[Test Publishers] END Test: ', testType]) mylog('minimal', ['[Test Publishers] END Test: ', testType])