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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
customer_extras.php
View File

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

4
lib/tablelisting/customer/tablelisting.ftps.php
View File

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

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

@@ -1,7 +1,7 @@
{% extends "Froxlor/user/form.html.twig" %} {% extends "Froxlor/user/form.html.twig" %}
{% block content %} {% 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"> <div class="row mb-2">
{% set type = 'warning' %} {% set type = 'warning' %}
{% set alert_msg = lng('error.customerhasongoingbackupjob') %} {% set alert_msg = lng('error.customerhasongoingbackupjob') %}