mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'bugfix/config-empty-mounts' into 'dev'
Fix bug where you cannot select "do not monitor mounts" from config.json See merge request crafty-controller/crafty-4!678
This commit is contained in:
commit
2eb012e61d
@ -12,6 +12,7 @@
|
||||
- Fix bug where no file error on import root dir ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/677))
|
||||
- Fix Unban button failing to pardon users ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/671))
|
||||
- Fix stack in API error handling ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/674))
|
||||
- Fix bug where you cannot select "do not monitor mounts" from `config.json` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/678))
|
||||
### Tweaks
|
||||
- Homogenize Panel logos/branding ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/666))
|
||||
- Retain previous tab when revisiting server details page (#272)([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/667))
|
||||
|
@ -170,7 +170,7 @@
|
||||
{% block js %}
|
||||
<script>
|
||||
function replacer(key, value) {
|
||||
if (key == "disabled_language_files") {
|
||||
if (key == "disabled_language_files" || key == "monitored_mounts") {
|
||||
if (value == 0) {
|
||||
return []
|
||||
} else {
|
||||
|
@ -102,8 +102,11 @@
|
||||
<div class="col-12 mt-4">
|
||||
<div class="d-flex">
|
||||
<div class="wrapper" style="width: 100%;">
|
||||
<h5 class="mb-1 font-weight-medium text-primary">Storage
|
||||
{% if len(data["monitored"]) > 0 %}
|
||||
<h5 class="mb-1 font-weight-medium text-primary">{{ translate('dashboard', 'storage',
|
||||
data['lang']) }}
|
||||
</h5>
|
||||
{% end %}
|
||||
<div id="storage_data">
|
||||
<div class="row">
|
||||
{% for item in data['hosts_data']['disk_json'] %}
|
||||
|
@ -111,6 +111,7 @@
|
||||
"starting": "Delayed-Start",
|
||||
"status": "Status",
|
||||
"stop": "Stop",
|
||||
"storage": "Storage",
|
||||
"version": "Version",
|
||||
"welcome": "Welcome to Crafty Controller"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user