View | Details | Raw Unified | Return to bug 39190
Collapse All | Expand All

(-)a/admin/sftp_servers.pl (-1 / +1 lines)
Lines 33-39 my $op = $input->param('op') || 'list'; Link Here
33
33
34
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
34
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
35
    {
35
    {
36
        template_name => "admin/sftp_servers.tt",
36
        template_name => "admin/file_transports.tt",
37
        query         => $input,
37
        query         => $input,
38
        type          => "intranet",
38
        type          => "intranet",
39
        flagsrequired => { parameters => 'manage_file_transports' },
39
        flagsrequired => { parameters => 'manage_file_transports' },
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-1 / +1 lines)
Lines 159-165 Link Here
159
                <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li>
159
                <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li>
160
            [% END %]
160
            [% END %]
161
            [% IF ( CAN_user_parameters_manage_file_transports ) %]
161
            [% IF ( CAN_user_parameters_manage_file_transports ) %]
162
                <li><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></li>
162
                <li><a href="/cgi-bin/koha/admin/file_transports.pl">File transports</a></li>
163
            [% END %]
163
            [% END %]
164
            [% IF ( CAN_user_parameters_manage_didyoumean ) %]
164
            [% IF ( CAN_user_parameters_manage_didyoumean ) %]
165
                <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
165
                <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-1 / +1 lines)
Lines 194-200 Link Here
194
        <span class="sub_permission manage_manage_smtp_servers_subpermission"> Manage SMTP servers </span>
194
        <span class="sub_permission manage_manage_smtp_servers_subpermission"> Manage SMTP servers </span>
195
        <span class="permissioncode">([% name | html %])</span>
195
        <span class="permissioncode">([% name | html %])</span>
196
    [%- CASE 'manage_file_transports' -%]
196
    [%- CASE 'manage_file_transports' -%]
197
        <span class="sub_permission manage_manage_file_transports_subpermission"> Manage FTP/SFTP servers </span>
197
        <span class="sub_permission manage_manage_file_transports_subpermission"> Manage file transports </span>
198
        <span class="permissioncode">([% name | html %])</span>
198
        <span class="permissioncode">([% name | html %])</span>
199
    [%- CASE 'manage_column_config' -%]
199
    [%- CASE 'manage_column_config' -%]
200
        <span class="sub_permission manage_column_config_subpermission"> Manage column configuration </span>
200
        <span class="sub_permission manage_column_config_subpermission"> Manage column configuration </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +2 lines)
Lines 274-281 Link Here
274
                        <dd>Define which SMTP servers to use</dd>
274
                        <dd>Define which SMTP servers to use</dd>
275
                    [% END %]
275
                    [% END %]
276
                    [% IF ( CAN_user_parameters_manage_file_transports ) %]
276
                    [% IF ( CAN_user_parameters_manage_file_transports ) %]
277
                        <dt><a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a></dt>
277
                        <dt><a href="/cgi-bin/koha/admin/file_transports.pl">File transports</a></dt>
278
                        <dd>Define available FTP/SFTP servers</dd>
278
                        <dd>Define available file transport servers (FTP/SFTP)</dd>
279
                    [% END %]
279
                    [% END %]
280
                    [% IF ( CAN_user_parameters_manage_didyoumean ) %]
280
                    [% IF ( CAN_user_parameters_manage_didyoumean ) %]
281
                        <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
281
                        <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sftp_servers.tt (-22 / +21 lines)
Lines 6-25 Link Here
6
<title
6
<title
7
    >[% FILTER collapse %]
7
    >[% FILTER collapse %]
8
        [% IF op == 'add_form' %]
8
        [% IF op == 'add_form' %]
9
            [% t("New FTP/SFTP server") | html %]
9
            [% t("New file transport") | html %]
10
            &rsaquo;
10
            &rsaquo;
11
        [% ELSIF op == 'edit_form' %]
11
        [% ELSIF op == 'edit_form' %]
12
            [% tx("Modify FTP/SFTP server '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]
12
            [% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]
13
            &rsaquo;
13
            &rsaquo;
14
        [% END %]
14
        [% END %]
15
        [% t("FTP/SFTP Servers") | html %]
15
        [% t("File transports") | html %]
16
        &rsaquo; [% t("Administration") | html %] &rsaquo; [% t("Koha") | html %]
16
        &rsaquo; [% t("Administration") | html %] &rsaquo; [% t("Koha") | html %]
17
    [% END %]</title
17
    [% END %]</title
18
>
18
>
19
[% INCLUDE 'doc-head-close.inc' %]
19
[% INCLUDE 'doc-head-close.inc' %]
20
</head>
20
</head>
21
21
22
<body id="admin_sftp_servers" class="admin">
22
<body id="admin_file_transports" class="admin">
23
[% WRAPPER 'header.inc' %]
23
[% WRAPPER 'header.inc' %]
24
    [% INCLUDE 'prefs-admin-search.inc' %]
24
    [% INCLUDE 'prefs-admin-search.inc' %]
25
[% END %]
25
[% END %]
Lines 32-52 Link Here
32
32
33
        [% IF op == 'add_form' || op == 'edit_form' %]
33
        [% IF op == 'add_form' || op == 'edit_form' %]
34
            [% WRAPPER breadcrumb_item %]
34
            [% WRAPPER breadcrumb_item %]
35
                <a href="/cgi-bin/koha/admin/sftp_servers.pl">FTP/SFTP servers</a>
35
                <a href="/cgi-bin/koha/admin/file_transports.pl">File transports</a>
36
            [% END %]
36
            [% END %]
37
        [% END %]
37
        [% END %]
38
38
39
        [% IF op == 'add_form' %]
39
        [% IF op == 'add_form' %]
40
            [% WRAPPER breadcrumb_item bc_active= 1 %]
40
            [% WRAPPER breadcrumb_item bc_active= 1 %]
41
                <span>New FTP/SFTP server</span>
41
                <span>New file transport</span>
42
            [% END %]
42
            [% END %]
43
        [% ELSIF op == 'edit_form' %]
43
        [% ELSIF op == 'edit_form' %]
44
            [% WRAPPER breadcrumb_item bc_active= 1 %]
44
            [% WRAPPER breadcrumb_item bc_active= 1 %]
45
                [% tx("Modify FTP/SFTP server '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]
45
                [% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]
46
            [% END %]
46
            [% END %]
47
        [% ELSE %]
47
        [% ELSE %]
48
            [% WRAPPER breadcrumb_item bc_active= 1 %]
48
            [% WRAPPER breadcrumb_item bc_active= 1 %]
49
                <span>FTP/SFTP servers</span>
49
                <span>File transports</span>
50
            [% END %]
50
            [% END %]
51
        [% END %]
51
        [% END %]
52
    [% END #/ WRAPPER breadcrumbs %]
52
    [% END #/ WRAPPER breadcrumbs %]
Lines 128-136 Link Here
128
                    </div>
128
                    </div>
129
                    <!-- END Modal -->
129
                    <!-- END Modal -->
130
130
131
                    <h1>New FTP/SFTP server</h1>
131
                    <h1>New file transport</h1>
132
132
133
                    <form action="/cgi-bin/koha/admin/sftp_servers.pl" id="add" name="add" class="validated" method="post">
133
                    <form action="/cgi-bin/koha/admin/file_transports.pl" id="add" name="add" class="validated" method="post">
134
                        [% INCLUDE 'csrf-token.inc' %]
134
                        [% INCLUDE 'csrf-token.inc' %]
135
                        <input type="hidden" name="op" value="cud-add" />
135
                        <input type="hidden" name="op" value="cud-add" />
136
                        <fieldset class="rows">
136
                        <fieldset class="rows">
Lines 216-222 Link Here
216
                        </fieldset>
216
                        </fieldset>
217
                        <fieldset class="action">
217
                        <fieldset class="action">
218
                            <a id="confirm_key_accept_submit" data-bs-target="#confirm_key_accept" class="btn btn-primary" data-bs-toggle="modal">Submit</a>
218
                            <a id="confirm_key_accept_submit" data-bs-target="#confirm_key_accept" class="btn btn-primary" data-bs-toggle="modal">Submit</a>
219
                            <a class="cancel" href="/cgi-bin/koha/admin/sftp_servers.pl">Cancel</a>
219
                            <a class="cancel" href="/cgi-bin/koha/admin/file_transports.pl">Cancel</a>
220
                        </fieldset>
220
                        </fieldset>
221
                    </form>
221
                    </form>
222
                [% END %]
222
                [% END %]
Lines 269-277 Link Here
269
                    </div>
269
                    </div>
270
                    <!-- END Modal -->
270
                    <!-- END Modal -->
271
271
272
                    <h1>[% tx("Modify FTP/SFTP server '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]</h1>
272
                    <h1>[% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]</h1>
273
273
274
                    <form action="/cgi-bin/koha/admin/sftp_servers.pl" id="edit_save" name="edit_save" class="validated" method="post">
274
                    <form action="/cgi-bin/koha/admin/file_transports.pl" id="edit_save" name="edit_save" class="validated" method="post">
275
                        [% INCLUDE 'csrf-token.inc' %]
275
                        [% INCLUDE 'csrf-token.inc' %]
276
                        <input type="hidden" name="op" value="cud-edit_save" />
276
                        <input type="hidden" name="op" value="cud-edit_save" />
277
                        <input type="hidden" name="sftp_server_id" value="[%- sftp_server.id | html -%]" />
277
                        <input type="hidden" name="sftp_server_id" value="[%- sftp_server.id | html -%]" />
Lines 394-416 Link Here
394
                        </fieldset>
394
                        </fieldset>
395
                        <fieldset class="action">
395
                        <fieldset class="action">
396
                            <a id="confirm_key_accept_submit" data-bs-target="#confirm_key_accept" class="btn btn-primary" data-bs-toggle="modal">Submit</a>
396
                            <a id="confirm_key_accept_submit" data-bs-target="#confirm_key_accept" class="btn btn-primary" data-bs-toggle="modal">Submit</a>
397
                            <a class="cancel" href="/cgi-bin/koha/admin/sftp_servers.pl">Cancel</a>
397
                            <a class="cancel" href="/cgi-bin/koha/admin/file_transports.pl">Cancel</a>
398
                        </fieldset>
398
                        </fieldset>
399
                    </form>
399
                    </form>
400
                [% END %]
400
                [% END %]
401
401
402
                [% IF op == 'list' %]
402
                [% IF op == 'list' %]
403
                    <div id="toolbar" class="btn-toolbar">
403
                    <div id="toolbar" class="btn-toolbar">
404
                        <a class="btn btn-default" id="new_sftp_server" href="/cgi-bin/koha/admin/sftp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New FTP/SFTP server</a>
404
                        <a class="btn btn-default" id="new_sftp_server" href="/cgi-bin/koha/admin/file_transports.pl?op=add_form"><i class="fa fa-plus"></i> New file transport</a>
405
                    </div>
405
                    </div>
406
406
407
                    <h1>FTP/SFTP servers</h1>
407
                    <h1>File transports</h1>
408
408
409
                    [% IF servers_count < 1 %]
409
                    [% IF servers_count < 1 %]
410
                        <div class="alert alert-info" id="dno_servers_message">
410
                        <div class="alert alert-info" id="dno_servers_message">
411
                            <p>
411
                            <p>
412
                                <em>There are no FTP/SFTP servers defined.</em><br />
412
                                <em>There are no file transports defined.</em><br />
413
                                To create one, use the <strong>new FTP/SFTP server</strong> button above.
413
                                To create one, use the <strong>new file transport</strong> button above.
414
                            </p>
414
                            </p>
415
                        </div>
415
                        </div>
416
                    [% ELSE %]
416
                    [% ELSE %]
Lines 481-487 Link Here
481
                        "url": sftp_servers_url
481
                        "url": sftp_servers_url
482
                    },
482
                    },
483
                    "language": {
483
                    "language": {
484
                        "emptyTable": "<div class=\"alert alert-info\">"+_("There are no FTP/SFTP servers defined.")+"</div>"
484
                        "emptyTable": "<div class=\"alert alert-info\">"+_("There are no file transports defined.")+"</div>"
485
                    },
485
                    },
486
                    "columnDefs": [ {
486
                    "columnDefs": [ {
487
                        "targets": [0,1],
487
                        "targets": [0,1],
Lines 617-623 Link Here
617
                        },
617
                        },
618
                        {
618
                        {
619
                            "data": function(row, type, val, meta) {
619
                            "data": function(row, type, val, meta) {
620
                                let result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/sftp_servers.pl?op=edit_form&amp;sftp_server_id='+ encodeURIComponent(row.sftp_server_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n";
620
                                let result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/file_transports.pl?op=edit_form&amp;sftp_server_id='+ encodeURIComponent(row.sftp_server_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n";
621
                                result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-bs-toggle="modal" data-bs-target="#delete_confirm_modal" data-sftp-server-id="'+ encodeURIComponent(row.sftp_server_id) +'" data-sftp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>';
621
                                result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-bs-toggle="modal" data-bs-target="#delete_confirm_modal" data-sftp-server-id="'+ encodeURIComponent(row.sftp_server_id) +'" data-sftp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>';
622
                                return result;
622
                                return result;
623
                            },
623
                            },
Lines 640-646 Link Here
640
                    var sftp_server_name = decodeURIComponent($(this).data('sftp-server-name'));
640
                    var sftp_server_name = decodeURIComponent($(this).data('sftp-server-name'));
641
641
642
                    $("#delete_confirm_dialog").html(
642
                    $("#delete_confirm_dialog").html(
643
                        _("You are about to delete the '%s' FTP/SFTP server.").format(sftp_server_name)
643
                        _("You are about to delete the '%s' file transport.").format(sftp_server_name)
644
                    );
644
                    );
645
                    $("#delete_confirm_modal_button").data('sftp-server-id', sftp_server_id);
645
                    $("#delete_confirm_modal_button").data('sftp-server-id', sftp_server_id);
646
                    $("#delete_confirm_modal_button").data('sftp-server-name', sftp_server_name);
646
                    $("#delete_confirm_modal_button").data('sftp-server-name', sftp_server_name);
647
- 

Return to bug 39190