maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

Browse Source
This commit is contained in:
envoyr
2022-04-21 18:20:13 +02:00
parent cb7f180d8d f82d78ad5d
commit e638511826
31 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Froxlor/user/form-datatable.html.twig
View File

@@ -1,7 +1,7 @@
{% extends "Froxlor/user/form.html.twig" %}
{% block content %}
{% if tabledata is not empty and tabledata is iterable %}
{% if tabledata.table.tr is not empty and tabledata.table.tr is iterable %}
<div class="row mb-2">
{% set type = 'warning' %}
{% set alert_msg = lng('error.customerhasongoingbackupjob') %}

8
templates/Froxlor/user/form.html.twig
View File

@@ -20,6 +20,13 @@
{% block actions %}
{% if formdata.self_overview is defined and formdata.self_overview is iterable %}
{% if action_links is not defined %}{% set actions_links = [] %}{% endif %}
{% set actions_tmp = actions_links %}
{% set actions_links = {'href': linker(formdata.self_overview), 'icon': 'fa fa-reply','label': lng('panel.backtooverview')} %}
{% set actions_links = {actions_links}|merge(actions_tmp) %}
{% endif %}
{% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
<div>
{% if actions_links is iterable %}
@@ -38,6 +45,7 @@
#}
</div>
{% endif %}
{% endblock %}
{% block content %}