cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fresh install fixes

Browse Source
This commit is contained in:
jokob-sk
2024-04-13 07:13:09 +10:00
parent ee90897208
commit b977781937
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfiles/pre-setup.sh
View File

@@ -32,7 +32,7 @@ echo -e '#!/bin/execlineb -P
[INSTALL] 🚀 Starting app (:${PORT}) [INSTALL] 🚀 Starting app (:${PORT})
" }' > /etc/s6-overlay/s6-rc.d/$APP_NAME/run " }' > /etc/s6-overlay/s6-rc.d/$APP_NAME/run
echo -e "python ${INSTALL_DIR}/server" >> /etc/s6-overlay/s6-rc.d/server/run echo -e "python ${INSTALL_DIR}/server" >> /etc/s6-overlay/s6-rc.d/$APP_NAME/run
touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx}/dependencies.d/SetupOneshot touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx}/dependencies.d/SetupOneshot
touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,$APP_NAME} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx,$APP_NAME}/dependencies.d/SetupOneshot touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,$APP_NAME} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx,$APP_NAME}/dependencies.d/SetupOneshot
touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm

2
front/devices.php
View File

@@ -402,6 +402,8 @@ function filterDataByStatus(data, status) {
return item.dev_NewDevice === 1; return item.dev_NewDevice === 1;
case 'down': case 'down':
return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0) || item.dev_PresentLastScan === 0; return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0) || item.dev_PresentLastScan === 0;
case 'down_only':
return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0);
case 'archived': case 'archived':
return item.dev_Archived === 1; return item.dev_Archived === 1;
default: default:

3
front/php/templates/header.php
View File

@@ -255,6 +255,9 @@ if ($ENABLED_DARKMODE === True) {
<li> <li>
<a href="devices.php#down" onclick="initializeDatatable('down')" > <?= lang("Device_Shortcut_DownAlerts");?> </a> <a href="devices.php#down" onclick="initializeDatatable('down')" > <?= lang("Device_Shortcut_DownAlerts");?> </a>
</li> </li>
<li>
<a href="devices.php#down_only" onclick="initializeDatatable('down_only')" > <?= lang("Device_Shortcut_DownOnly");?> </a>
</li>
<li> <li>
<a href="devices.php#archived" onclick="initializeDatatable('archived')" > <?= lang("Device_Shortcut_Archived");?> </a> <a href="devices.php#archived" onclick="initializeDatatable('archived')" > <?= lang("Device_Shortcut_Archived");?> </a>
</li> </li>

1
front/php/templates/language/en_us.json
View File

@@ -189,6 +189,7 @@
"Device_Shortcut_Connected": "Connected", "Device_Shortcut_Connected": "Connected",
"Device_Shortcut_Devices": "Devices", "Device_Shortcut_Devices": "Devices",
"Device_Shortcut_DownAlerts": "Down & Offline", "Device_Shortcut_DownAlerts": "Down & Offline",
"Device_Shortcut_DownOnly": "Down",
"Device_Shortcut_Favorites": "Favorites", "Device_Shortcut_Favorites": "Favorites",
"Device_Shortcut_NewDevices": "New Devices", "Device_Shortcut_NewDevices": "New Devices",
"Device_Shortcut_OnlineChart": "Device presence", "Device_Shortcut_OnlineChart": "Device presence",