mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'dev' into bug/pretzel-fresh-install
This commit is contained in:
Zedifus
commit
8c3649d0bb
@ -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
|
||||
<br><br>
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
|
||||
<link rel="stylesheet" href="/static/assets/vendors/fontawesome5/css/all.css">
|
||||
<link rel="stylesheet" type="text/css"
|
||||
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" />
|
||||
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" />
|
||||
<link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
|
||||
<link rel="stylesheet" href="/static/assets/css/crafty.css">
|
||||
|
||||
@ -72,7 +72,7 @@
|
||||
{% include notify.html %}
|
||||
|
||||
<button class="navbar-toggler navbar-toggler-right d-lg-none align-self-center" type="button"
|
||||
data-toggle="offcanvas">
|
||||
data-toggle="offcanvas">
|
||||
<span class="mdi mdi-menu"></span>
|
||||
</button>
|
||||
</div>
|
||||
@ -163,7 +163,7 @@
|
||||
<script src="/static/assets/js/shared/hoverable-collapse.js"></script>
|
||||
<script src="/static/assets/js/shared/misc.js"></script>
|
||||
<script type="text/javascript"
|
||||
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"></script>
|
||||
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"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
|
||||
<script type="text/javascript" src="/static/assets/js/motd.js"></script>
|
||||
|
||||
@ -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")
|
||||
});
|
||||
</script>
|
||||
|
||||
{% block js %}
|
||||
|
||||
@ -136,7 +136,8 @@
|
||||
<label for="delay">{{ translate('serverScheduleConfig', 'offset' , data['lang']) }} <small
|
||||
class="text-muted ml-1"> - {{ translate('serverScheduleConfig', 'offset-explain' ,
|
||||
data['lang']) }}</small> </label>
|
||||
<input type="number" class="form-control" name="delay" id="delay" value="0">
|
||||
<input type="number" class="form-control" name="delay" id="delay"
|
||||
value="{{ data['schedule']['delay']}}">
|
||||
<br>
|
||||
<br>
|
||||
<label for="parent">{{ translate('serverScheduleConfig', 'parent' , data['lang']) }} <small
|
||||
|
||||
Loading…
Reference in New Issue
Block a user