Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/upload-progress

Browse Source
This commit is contained in:
Zedifus 2023-02-11 18:10:32 +00:00
commit 5b383d9fa9
7 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -3,11 +3,11 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix exception related to page data on server start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/544))
### Tweaks ### Tweaks
TBD - Cleanup authentication helpers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/545))
### Lang ### Lang
TBD - Add additional translations to backups page strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/543))
<br><br> <br><br>
## --- [4.0.20] - 2023/01/29 ## --- [4.0.20] - 2023/01/29

1
app/classes/shared/authentication.py
View File

@ -13,7 +13,6 @@ logger = logging.getLogger(__name__)
class Authentication: class Authentication:
def __init__(self, helper): def __init__(self, helper):
self.helper = helper self.helper = helper
self.secret = "my secret"
try: try:
self.secret = ManagementController.get_crafty_api_key() self.secret = ManagementController.get_crafty_api_key()
if self.secret == "": if self.secret == "":

4
app/classes/shared/helpers.py
View File

@ -1013,7 +1013,7 @@ class Helpers:
for item in file_list: for item in file_list:
if os.path.isdir(os.path.join(folder, item)): if os.path.isdir(os.path.join(folder, item)):
dir_list.append(item) dir_list.append(item)
elif str(item) != "crafty.sqlite": elif str(item) != self.ignored_names:
unsorted_files.append(item) unsorted_files.append(item)
file_list = sorted(dir_list, key=str.casefold) + sorted( file_list = sorted(dir_list, key=str.casefold) + sorted(
unsorted_files, key=str.casefold unsorted_files, key=str.casefold
@ -1054,7 +1054,7 @@ class Helpers:
for item in file_list: for item in file_list:
if os.path.isdir(os.path.join(folder, item)): if os.path.isdir(os.path.join(folder, item)):
dir_list.append(item) dir_list.append(item)
elif str(item) != "crafty.sqlite": elif str(item) != self.ignored_names:
unsorted_files.append(item) unsorted_files.append(item)
file_list = sorted(dir_list, key=str.casefold) + sorted( file_list = sorted(dir_list, key=str.casefold) + sorted(
unsorted_files, key=str.casefold unsorted_files, key=str.casefold

1
app/classes/web/server_handler.py
View File

@ -183,6 +183,7 @@ class ServerHandler(BaseHandler):
"version_data": "version_data_here", # TODO "version_data": "version_data_here", # TODO
"user_data": exec_user, "user_data": exec_user,
"show_contribute": self.helper.get_setting("show_contribute_link", True), "show_contribute": self.helper.get_setting("show_contribute_link", True),
"background": self.controller.cached_login,
"lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]), "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
"lang_page": Helpers.get_lang_page( "lang_page": Helpers.get_lang_page(
self.controller.users.get_user_lang_by_id(exec_user["user_id"]) self.controller.users.get_user_lang_by_id(exec_user["user_id"])

12
app/classes/web/status_handler.py
View File

@ -7,12 +7,12 @@ logger = logging.getLogger(__name__)
class StatusHandler(BaseHandler): class StatusHandler(BaseHandler):
def get(self): def get(self):
page_data = {"background": self.controller.cached_login} page_data = {
page_data["lang"] = self.helper.get_setting("language") "background": self.controller.cached_login,
page_data["lang_page"] = self.helper.get_lang_page( "lang": self.helper.get_setting("language"),
self.helper.get_setting("language") "lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
) "servers": self.controller.servers.get_all_servers_stats(),
page_data["servers"] = self.controller.servers.get_all_servers_stats() }
running = 0 running = 0
for srv in page_data["servers"]: for srv in page_data["servers"]:
if srv["stats"]["running"]: if srv["stats"]["running"]:

16
app/frontend/templates/panel/server_backup.html
View File

@ -110,15 +110,15 @@
<div class="form-group"> <div class="form-group">
<label for="command-check" class="form-check-label ml-4 mb-4"></label> <label for="command-check" class="form-check-label ml-4 mb-4"></label>
{% if data['backup_config']['before'] %} {% if data['backup_config']['before'] %}
<input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>Run <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>{{
Command Before Backup translate('serverBackups', 'before', data['lang']) }}
<br> <br>
<input type="text" class="form-control" name="backup_before" id="backup_before" <input type="text" class="form-control" name="backup_before" id="backup_before"
value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you" value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you"
style="display: inline-block;"> style="display: inline-block;">
{% else %} {% else %}
<input type="checkbox" class="form-check-input" id="before-check" name="before-check">Run Command <input type="checkbox" class="form-check-input" id="before-check" name="before-check">{{
Before Backup translate('serverBackups', 'before', data['lang']) }}
<br> <br>
<input type="text" class="form-control" name="backup_before" id="backup_before" value="" <input type="text" class="form-control" name="backup_before" id="backup_before" value=""
placeholder="We enter the / for you." style="display: none;"> placeholder="We enter the / for you." style="display: none;">
@ -127,15 +127,15 @@
<div class="form-group"> <div class="form-group">
<label for="command-check" class="form-check-label ml-4 mb-4"></label> <label for="command-check" class="form-check-label ml-4 mb-4"></label>
{% if data['backup_config']['after'] %} {% if data['backup_config']['after'] %}
<input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>Run <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>{{
Command After Backup translate('serverBackups', 'after', data['lang']) }}
<br> <br>
<input type="text" class="form-control" name="backup_after" id="backup_after" <input type="text" class="form-control" name="backup_after" id="backup_after"
value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you" value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you"
style="display: inline-block;"> style="display: inline-block;">
{% else %} {% else %}
<input type="checkbox" class="form-check-input" id="after-check" name="after-check">Run Command <input type="checkbox" class="form-check-input" id="after-check" name="after-check">{{
Before Backup translate('serverBackups', 'after', data['lang']) }}
<br> <br>
<input type="text" class="form-control" name="backup_after" id="backup_after" value="" <input type="text" class="form-control" name="backup_after" id="backup_after" value=""
placeholder="We enter the / for you." style="display: none;"> placeholder="We enter the / for you." style="display: none;">

4
app/translations/en_EN.json
View File

@ -297,7 +297,9 @@
"shutdown": "Shutdown server for duration of backup", "shutdown": "Shutdown server for duration of backup",
"size": "Size", "size": "Size",
"storageLocation": "Storage Location", "storageLocation": "Storage Location",
"storageLocationDesc": "Where do you want to store backups?" "storageLocationDesc": "Where do you want to store backups?",
"before": "Run command before backup",
"after": "Run command after backup"
}, },
"serverConfig": { "serverConfig": {
"bePatientDelete": "Please be patient while we remove your server from the Crafty panel. This screen will close in a few moments.", "bePatientDelete": "Please be patient while we remove your server from the Crafty panel. This screen will close in a few moments.",