diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cdba0be..0cef6b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ ### New features TBD ### Bug fixes -TBD +- Fix reaction tasks not firing ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423)) +- QOL task delay offset not following over on task edit ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423)) ### Tweaks -TBD +- Session Handling | Logout on browser close ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/424)) ### Lang TBD

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py index 7055d1cb..a654df6d 100644 --- a/app/classes/shared/tasks.py +++ b/app/classes/shared/tasks.py @@ -3,7 +3,7 @@ import time import logging import threading import asyncio -from datetime import datetime +import datetime from tzlocal import get_localzone from tzlocal.utils import ZoneInfoNotFoundError @@ -199,7 +199,7 @@ class TasksManager: "interval", hours=12, id="update_watcher", - start_date=datetime.now(), + start_date=datetime.datetime.now(), ) # self.scheduler.add_job( # self.scheduler.print_jobs, "interval", seconds=10, id="-1" diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 2334c862..2a69717e 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -962,6 +962,7 @@ class PanelHandler(BaseHandler): page_data["schedule"]["command"] = "" page_data["schedule"]["one_time"] = False page_data["schedule"]["cron_string"] = "" + page_data["schedule"]["delay"] = 0 page_data["schedule"]["time"] = "" page_data["schedule"]["interval"] = "" # we don't need to check difficulty here. @@ -1041,6 +1042,7 @@ class PanelHandler(BaseHandler): page_data["schedule"]["command"] = schedule.command else: page_data["schedule"]["command"] = "" + page_data["schedule"]["delay"] = schedule.delay page_data["schedule"]["enabled"] = schedule.enabled page_data["schedule"]["one_time"] = schedule.one_time page_data["schedule"]["cron_string"] = schedule.cron_string diff --git a/app/config/credits.json b/app/config/credits.json index ae2017d9..fac21fdb 100644 --- a/app/config/credits.json +++ b/app/config/credits.json @@ -105,21 +105,6 @@ ], "blurb": "Developer at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"", "pic": "/static/assets/images/credits/silversthorn.png" - }, - { - "name": "ThatOneLukas", - "title": "Software Engineer", - "loc": "Helsinki, FI", - "tags": [ - "Staff", - [ - "Developer", - "https://gitlab.com/LukasDoesDev" - ], - null - ], - "blurb": "Arch Linux enthusiast who likes 80s/90s music, Rust (The programming language) and light distros like Arch Linux btw. Dislikes C, C++, Go, and Microsoft. Also doesn't like Finnish weather that freezes molten snow to (deadly) ice.", - "pic": "/static/assets/images/credits/lukas.png" } ], "support": [ @@ -217,6 +202,21 @@ ], "blurb": "His interests include learning, Linux, and programming. He loves pentesting apps and gaming.", "pic": "/static/assets/images/credits/mcgaming.png" + }, + { + "name": "ThatOneLukas", + "title": "Software Engineer", + "loc": "Helsinki, FI", + "tags": [ + "Staff", + [ + "Developer", + "https://gitlab.com/LukasDoesDev" + ], + null + ], + "blurb": "Arch Linux enthusiast who likes 80s/90s music, Rust (The programming language) and light distros like Arch Linux btw. Dislikes C, C++, Go, and Microsoft. Also doesn't like Finnish weather that freezes molten snow to (deadly) ice.", + "pic": "/static/assets/images/credits/lukas.png" } ] }, diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 4133dfac..46b6e622 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -15,7 +15,7 @@ + href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> @@ -72,7 +72,7 @@ {% include notify.html %} @@ -163,7 +163,7 @@ + src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"> @@ -191,7 +191,7 @@ $.extend($.fn.dataTable.defaults, { // {{ '\nlanguage:' }} {% raw translate('datatables', 'i18n', data['lang']) %} - }) + }) //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security function getCookie(name) { @@ -516,6 +516,9 @@ }); }); + $(window).unload(function () { + jQuery.get("/public/logout") + }); {% block js %} @@ -525,4 +528,4 @@ - + \ No newline at end of file diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index 34057466..943c233e 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -136,7 +136,8 @@ - +