NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-31 21:06:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into enhancement/themes

Browse Source
This commit is contained in:
Zedifus 2022-10-02 19:52:56 +01:00
commit 7cc8503941
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,9 +1,11 @@
# Changelog # Changelog
## --- [4.0.15] - 2022/TBD ## --- [4.0.15] - 2022/10/02
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix traceback on basic schedule with "days" interval ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/469))
- Fix bad method call with API stdin ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/470))<br>
*(Thank you ['IWant2Tryhard'](https://github.com/MyNameTsThad) for catching that 🐛)*
### Tweaks ### Tweaks
TBD TBD
### Lang ### Lang

4
app/classes/web/panel_handler.py
View File

@ -1702,7 +1702,7 @@ class PanelHandler(BaseHandler):
# only check for time if it's number of days # only check for time if it's number of days
if interval_type == "days": if interval_type == "days":
sch_time = bleach.clean(self.get_argument("time", None)) sch_time = bleach.clean(self.get_argument("time", None))
if interval > 30: if int(interval) > 30:
self.redirect( self.redirect(
"/panel/error?error=Invalid argument." "/panel/error?error=Invalid argument."
" Days must be 30 or fewer." " Days must be 30 or fewer."
@ -1870,7 +1870,7 @@ class PanelHandler(BaseHandler):
# only check for time if it's number of days # only check for time if it's number of days
if interval_type == "days": if interval_type == "days":
sch_time = bleach.clean(self.get_argument("time", None)) sch_time = bleach.clean(self.get_argument("time", None))
if interval > 30: if int(interval) > 30:
self.redirect( self.redirect(
"/panel/error?error=Invalid argument." "/panel/error?error=Invalid argument."
" Days must be 30 or fewer." " Days must be 30 or fewer."

2
app/classes/web/routes/api/servers/server/stdin.py
View File

@ -26,7 +26,7 @@ class ApiServersServerStdinHandler(BaseApiHandler):
# if the user doesn't have Commands permission, return an error # if the user doesn't have Commands permission, return an error
return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"}) return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
svr = self.controller.get_server_obj_optional(server_id) svr = self.controller.servers.get_server_obj_optional(server_id)
if svr is None: if svr is None:
# It's in auth_data[0] but not as a Server object # It's in auth_data[0] but not as a Server object
logger.critical( logger.critical(