fix ftp-action-links in listing; fix display of running/scheduled backup-job

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-20 16:51:40 +02:00
parent 949f258f54
commit 74021ae142
3 changed files with 4 additions and 5 deletions

View File

@@ -292,8 +292,7 @@ if ($page == 'overview' || $page == 'htpasswds') {
// check whether there is a backup-job for this customer
try {
$backup_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.backups.php';
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\CustomerBackups::class, $userinfo))
->withPagination($backup_list_data['backup_list']['columns']);
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\CustomerBackups::class, $userinfo));
} catch (Exception $e) {
\Froxlor\UI\Response::dynamic_error($e->getMessage());
}

View File

@@ -57,7 +57,7 @@ return [
'title' => $lng['panel']['edit'],
'href' => [
'section' => 'ftp',
'page' => 'ftps',
'page' => 'accounts',
'action' => 'edit',
'id' => ':id'
],
@@ -68,7 +68,7 @@ return [
'class' => 'btn-danger',
'href' => [
'section' => 'ftp',
'page' => 'ftps',
'page' => 'accounts',
'action' => 'delete',
'id' => ':id'
],

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') %}