Bugzilla – Attachment 187281 Details for
Bug 38489
EDI should be updated to use the new FTP/SFTP Servers management page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38489: Follow-up to bug 39190 to fix administration
5194b73.patch (text/plain), 42.81 KB, created by
Kyle M Hall (khall)
on 2025-10-02 13:35:51 UTC
(
hide
)
Description:
Bug 38489: Follow-up to bug 39190 to fix administration
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2025-10-02 13:35:51 UTC
Size:
42.81 KB
patch
obsolete
>From 5194b731fd0e33f8463f3cb43ebb836d67db6bee Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@openfifth.co.uk> >Date: Tue, 30 Sep 2025 12:58:51 +0100 >Subject: [PATCH] Bug 38489: Follow-up to bug 39190 to fix administration > >We did some last minute renaming of things in bug 39190 but didn't catch >all the places. This patch updates the old 'sftp_servers' naming scheme >to 'file_transports' following the new pattern and restores edit and >delete functionality in the File transports management area. > >Sponsored-by: ByWater Solutions >Signed-off-by: Hannah Dunne-Howrie <hdunne-howrie@westminster.gov.uk> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > admin/file_transports.pl | 108 ++++---- > .../prog/en/modules/admin/file_transports.tt | 260 +++++++++--------- > 2 files changed, 184 insertions(+), 184 deletions(-) > >diff --git a/admin/file_transports.pl b/admin/file_transports.pl >index d7971ce3b8f..dda6fe2dd1f 100755 >--- a/admin/file_transports.pl >+++ b/admin/file_transports.pl >@@ -42,25 +42,25 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > > my @messages; > >-my $sftp_servers = Koha::File::Transports->search; >+my $file_transports = Koha::File::Transports->search; > > if ( $op eq 'cud-add' ) { >- my $name = $input->param('sftp_name'); >- my $host = $input->param('sftp_host') || 'localhost'; >- my $port = $input->param('sftp_port') || 22; >- my $transport = $input->param('sftp_transport') || 'sftp'; >- my $passive = ( scalar $input->param('sftp_passiv') ) ? 1 : 0; >- my $auth_mode = $input->param('sftp_auth_mode') || 'password'; >- my $user_name = $input->param('sftp_user_name') || undef; >- my $password = $input->param('sftp_password') || undef; >- my $key_file = $input->param('sftp_key_file') || undef; >- my $download_directory = $input->param('sftp_download_directory') || undef; >- my $upload_directory = $input->param('sftp_upload_directory') || undef; >- my $status = $input->param('sftp_status') || ''; >- my $debug = ( scalar $input->param('sftp_debug_mode') ) ? 1 : 0; >+ my $name = $input->param('name'); >+ my $host = $input->param('host') || 'localhost'; >+ my $port = $input->param('port') || 22; >+ my $transport = $input->param('transport') || 'sftp'; >+ my $passive = ( scalar $input->param('passiv') ) ? 1 : 0; >+ my $auth_mode = $input->param('auth_mode') || 'password'; >+ my $user_name = $input->param('user_name') || undef; >+ my $password = $input->param('password') || undef; >+ my $key_file = $input->param('key_file') || undef; >+ my $download_directory = $input->param('download_directory') || undef; >+ my $upload_directory = $input->param('upload_directory') || undef; >+ my $status = $input->param('status') || ''; >+ my $debug = ( scalar $input->param('debug_mode') ) ? 1 : 0; > > try { >- my $sftp_server = Koha::File::Transport->new( >+ my $file_transport = Koha::File::Transport->new( > { > name => $name, > host => $host, >@@ -96,24 +96,24 @@ if ( $op eq 'cud-add' ) { > $op = 'list'; > > } elsif ( $op eq 'edit_form' ) { >- my $sftp_server_id = $input->param('sftp_server_id'); >- my $sftp_server; >- my $sftp_server_plain_text_password; >- my $sftp_server_plain_text_key; >+ my $file_transport_id = $input->param('file_transport_id'); >+ my $file_transport; >+ my $file_transport_plain_text_password; >+ my $file_transport_plain_text_key; > >- $sftp_server = Koha::File::Transports->find($sftp_server_id) >- unless !$sftp_server_id; >+ $file_transport = Koha::File::Transports->find($file_transport_id) >+ unless !$file_transport_id; > >- unless ( !$sftp_server ) { >- $sftp_server_plain_text_password = $sftp_server->plain_text_password || ''; >- $sftp_server_plain_text_key = $sftp_server->plain_text_key || ''; >+ unless ( !$file_transport ) { >+ $file_transport_plain_text_password = $file_transport->plain_text_password || ''; >+ $file_transport_plain_text_key = $file_transport->plain_text_key || ''; > } > >- if ($sftp_server) { >+ if ($file_transport) { > $template->param( >- sftp_server => $sftp_server, >- sftp_server_plain_text_password => $sftp_server_plain_text_password, >- sftp_server_plain_text_key => $sftp_server_plain_text_key, >+ file_transport => $file_transport, >+ file_transport_plain_text_password => $file_transport_plain_text_password, >+ file_transport_plain_text_key => $file_transport_plain_text_key, > ); > } else { > push @messages, { >@@ -124,33 +124,33 @@ if ( $op eq 'cud-add' ) { > } > > } elsif ( $op eq 'cud-edit_save' ) { >- my $sftp_server_id = $input->param('sftp_server_id'); >- my $sftp_server_plain_text_password; >- my $sftp_server; >- >- $sftp_server = Koha::File::Transports->find($sftp_server_id) >- unless !$sftp_server_id; >- >- $sftp_server_plain_text_password = $sftp_server->plain_text_password >- unless !$sftp_server_id; >- >- if ($sftp_server) { >- my $name = $input->param('sftp_name'); >- my $host = $input->param('sftp_host') || 'localhost'; >- my $port = $input->param('sftp_port') || 22; >- my $transport = $input->param('sftp_transport') || 'sftp'; >- my $passive = ( scalar $input->param('sftp_passiv') ) ? 1 : 0; >- my $auth_mode = $input->param('sftp_auth_mode') || 'password'; >- my $user_name = $input->param('sftp_user_name') || undef; >- my $password = $input->param('sftp_password') || undef; >- my $key_file = $input->param('sftp_key_file') || undef; >- my $download_directory = $input->param('sftp_download_directory') || undef; >- my $upload_directory = $input->param('sftp_upload_directory') || undef; >- my $status = $input->param('sftp_status') || ''; >- my $debug = ( scalar $input->param('sftp_debug_mode') ) ? 1 : 0; >+ my $file_transport_id = $input->param('file_transport_id'); >+ my $file_transport_plain_text_password; >+ my $file_transport; >+ >+ $file_transport = Koha::File::Transports->find($file_transport_id) >+ unless !$file_transport_id; >+ >+ $file_transport_plain_text_password = $file_transport->plain_text_password >+ unless !$file_transport_id; >+ >+ if ($file_transport) { >+ my $name = $input->param('name'); >+ my $host = $input->param('host') || 'localhost'; >+ my $port = $input->param('port') || 22; >+ my $transport = $input->param('transport') || 'sftp'; >+ my $passive = ( scalar $input->param('passiv') ) ? 1 : 0; >+ my $auth_mode = $input->param('auth_mode') || 'password'; >+ my $user_name = $input->param('user_name') || undef; >+ my $password = $input->param('password') || undef; >+ my $key_file = $input->param('key_file') || undef; >+ my $download_directory = $input->param('download_directory') || undef; >+ my $upload_directory = $input->param('upload_directory') || undef; >+ my $status = $input->param('status') || ''; >+ my $debug = ( scalar $input->param('debug_mode') ) ? 1 : 0; > > try { >- $sftp_server->set( >+ $file_transport->set( > { > name => $name, > host => $host, >@@ -195,7 +195,7 @@ if ( $op eq 'cud-add' ) { > > if ( $op eq 'list' ) { > $template->param( >- servers_count => $sftp_servers->count, >+ servers_count => $file_transports->count, > ); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt >index 56c01e175d3..a14f419102a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/file_transports.tt >@@ -9,7 +9,7 @@ > [% t("New file transport") | html %] > › > [% ELSIF op == 'edit_form' %] >- [% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %] >+ [% tx("Modify file transport '{file_transport}'", { file_transport = file_transport.name }) | html %] > › > [% END %] > [% t("File transports") | html %] >@@ -42,7 +42,7 @@ > [% END %] > [% ELSIF op == 'edit_form' %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- [% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %] >+ [% tx("Modify file transport '{file_transport}'", { file_transport = file_transport.name }) | html %] > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >@@ -59,7 +59,7 @@ > [% INCLUDE 'messages.inc' %] > > [% FOREACH m IN messages %] >- <div class="alert alert-[% m.type | html %]" id="sftp_action_result_dialog"> >+ <div class="alert alert-[% m.type | html %]" id="action_result_dialog"> > [% SWITCH m.code %] > [% CASE 'error_on_insert' %] > <span>An error occurred when adding the server. The passed ID already exists.</span> >@@ -77,8 +77,8 @@ > </div> > [% END %] > >- <div class="alert alert-info" id="sftp_delete_success" style="display: none;"></div> >- <div class="alert alert-warning" id="sftp_delete_error" style="display: none;"></div> >+ <div class="alert alert-info" id="delete_success" style="display: none;"></div> >+ <div class="alert alert-warning" id="delete_error" style="display: none;"></div> > > [% IF op == 'add_form' %] > <!-- Modal --> >@@ -136,8 +136,8 @@ > <fieldset class="rows"> > <ol> > <li> >- <label for="sftp_name" class="required">Name: </label> >- <input type="text" name="sftp_name" id="sftp_name" size="60" class="required focus" required="required" /> >+ <label for="name" class="required">Name: </label> >+ <input type="text" name="name" id="name" size="60" class="required focus" required="required" /> > <span class="required">Required</span> > </li> > </ol> >@@ -146,67 +146,67 @@ > <fieldset class="rows"> > <ol> > <li> >- <label for="sftp_transport" class="required">Transport: </label> >- <select name="sftp_transport" id="sftp_transport" class="required"> >+ <label for="transport" class="required">Transport: </label> >+ <select name="transport" id="transport" class="required"> > <option value="ftp">FTP</option> > <option value="sftp" selected="selected">SFTP</option> > </select> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_host" class="required">Host: </label> >- <input type="text" value="localhost" name="sftp_host" id="sftp_host" size="60" class="required" /> >+ <label for="host" class="required">Host: </label> >+ <input type="text" value="localhost" name="host" id="host" size="60" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_port" class="required">Port: </label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" value="22" name="sftp_port" id="sftp_port" size="20" class="required" /> >+ <label for="port" class="required">Port: </label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" value="22" name="port" id="port" size="20" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_passive">Passive mode: </label> >- <select name="sftp_passive" id="sftp_passive" disabled="disabled"> >+ <label for="passive">Passive mode: </label> >+ <select name="passive" id="passive" disabled="disabled"> > <option value="1" selected="selected">On (Recommended)</option> > <option value="0">Off</option> > </select> > <span class="hint">Only applies to FTP connections</span> > </li> > <li> >- <label for="sftp_auth_mode">Authentication mode: </label> >- <select name="sftp_auth_mode" id="sftp_auth_mode"> >+ <label for="auth_mode">Authentication mode: </label> >+ <select name="auth_mode" id="auth_mode"> > <option value="password" selected="selected">Password-based</option> > <option value="key_file">Key file-based</option> > <option value="noauth">No authentication</option> > </select> > </li> > <li> >- <label for="sftp_user_name" class="required">Username: </label> >- <input type="text" name="sftp_user_name" id="sftp_user_name" size="60" autocomplete="off" class="required" /> >+ <label for="user_name" class="required">Username: </label> >+ <input type="text" name="user_name" id="user_name" size="60" autocomplete="off" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_password">Password: </label> >- <input type="password" name="sftp_password" id="sftp_password" size="60" autocomplete="off" /> >+ <label for="password">Password: </label> >+ <input type="password" name="password" id="password" size="60" autocomplete="off" /> > </li> > <li> >- <label for="sftp_key_file">Key file: </label> >- <textarea name="sftp_key_file" id="sftp_key_file" rows="10" cols="58"></textarea> >+ <label for="key_file">Key file: </label> >+ <textarea name="key_file" id="key_file" rows="10" cols="58"></textarea> > <span class="hint">Only applies to SFTP connections</span> > </li> > <li> >- <label for="sftp_download_directory">Remote download directory: </label> >- <input type="text" name="sftp_download_directory" id="sftp_download_directory" size="60" autocomplete="off" /><br /> >+ <label for="download_directory">Remote download directory: </label> >+ <input type="text" name="download_directory" id="download_directory" size="60" autocomplete="off" /><br /> > <span class="hint">The path on the remote server where we will download from</span> > </li> > <li> >- <label for="sftp_upload_directory">Remote upload directory: </label> >- <input type="text" name="sftp_upload_directory" id="sftp_upload_directory" size="60" autocomplete="off" /><br /> >+ <label for="upload_directory">Remote upload directory: </label> >+ <input type="text" name="upload_directory" id="upload_directory" size="60" autocomplete="off" /><br /> > <span class="hint">The path on the remote server where we will upload to</span> > </li> >- <input type="hidden" value="" name="sftp_status" id="sftp_status" /> >+ <input type="hidden" value="" name="status" id="status" /> > <li> >- <label for="sftp_debug_mode">Debug mode: </label> >- <select name="sftp_debug_mode" id="sftp_debug_mode"> >+ <label for="debug_mode">Debug mode: </label> >+ <select name="debug_mode" id="debug_mode"> > <option value="1">Enabled</option> > <option value="0" selected="selected">Disabled</option> > </select> >@@ -269,17 +269,17 @@ > </div> > <!-- END Modal --> > >- <h1>[% tx("Modify file transport '{sftp_server}'", { sftp_server = sftp_server.name }) | html %]</h1> >+ <h1>[% tx("Modify file transport '{file_transport}'", { file_transport = file_transport.name }) | html %]</h1> > > <form action="/cgi-bin/koha/admin/file_transports.pl" id="edit_save" name="edit_save" class="validated" method="post"> > [% INCLUDE 'csrf-token.inc' %] > <input type="hidden" name="op" value="cud-edit_save" /> >- <input type="hidden" name="file_transport_id" value="[%- sftp_server.id | html -%]" /> >+ <input type="hidden" name="file_transport_id" value="[%- file_transport.id | html -%]" /> > <fieldset class="rows"> > <ol> > <li> >- <label for="sftp_name" class="required">Name: </label> >- <input type="text" value="[% sftp_server.name | html %]" name="sftp_name" id="sftp_name" size="60" class="required focus" required="required" /> >+ <label for="name" class="required">Name: </label> >+ <input type="text" value="[% file_transport.name | html %]" name="name" id="name" size="60" class="required focus" required="required" /> > <span class="required">Required</span> > </li> > </ol> >@@ -288,14 +288,14 @@ > <fieldset class="rows"> > <ol> > <li> >- <label for="sftp_transport" class="required">Transport: </label> >- <select name="sftp_transport" id="sftp_transport" class="required"> >- [% IF sftp_server.transport == 'ftp' %] >+ <label for="transport" class="required">Transport: </label> >+ <select name="transport" id="transport" class="required"> >+ [% IF file_transport.transport == 'ftp' %] > <option value="ftp" selected="selected">FTP</option> > [% ELSE %] > <option value="ftp">FTP</option> > [% END %] >- [% IF sftp_server.transport == 'sftp' %] >+ [% IF file_transport.transport == 'sftp' %] > <option value="sftp" selected="selected">SFTP</option> > [% ELSE %] > <option value="sftp">SFTP</option> >@@ -304,24 +304,24 @@ > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_host" class="required">Host: </label> >- <input type="text" value="[% sftp_server.host | html %]" name="sftp_host" id="sftp_host" size="60" class="required" /> >+ <label for="host" class="required">Host: </label> >+ <input type="text" value="[% file_transport.host | html %]" name="host" id="host" size="60" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_port" class="required">Port: </label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" value="[% sftp_server.port | html %]" name="sftp_port" id="sftp_port" size="20" class="required" /> >+ <label for="port" class="required">Port: </label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" value="[% file_transport.port | html %]" name="port" id="port" size="20" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_passive">Passive mode: </label> >- <select name="sftp_passive" id="sftp_passive" disabled="disabled"> >- [% IF sftp_server.passive == 1 %] >+ <label for="passive">Passive mode: </label> >+ <select name="passive" id="passive" disabled="disabled"> >+ [% IF file_transport.passive == 1 %] > <option value="1" selected="selected">Enabled (Recommended)</option> > [% ELSE %] > <option value="1">Enabled (Recommended)</option> > [% END %] >- [% IF sftp_server.passive == 0 %] >+ [% IF file_transport.passive == 0 %] > <option value="0" selected="selected">Disabled</option> > [% ELSE %] > <option value="0">Disabled</option> >@@ -330,19 +330,19 @@ > <span class="hint">Only applies to FTP connections</span> > </li> > <li> >- <label for="sftp_auth_mode">Authentication mode: </label> >- <select name="sftp_auth_mode" id="sftp_auth_mode"> >- [% IF sftp_server.auth_mode == 'password' %] >+ <label for="auth_mode">Authentication mode: </label> >+ <select name="auth_mode" id="auth_mode"> >+ [% IF file_transport.auth_mode == 'password' %] > <option value="password" selected="selected">Password-based</option> > [% ELSE %] > <option value="password">Password-based</option> > [% END %] >- [% IF sftp_server.auth_mode == 'key_file' %] >+ [% IF file_transport.auth_mode == 'key_file' %] > <option value="key_file" selected="selected">Key file-based</option> > [% ELSE %] > <option value="key_file">Key file-based</option> > [% END %] >- [% IF sftp_server.auth_mode == 'noauth' %] >+ [% IF file_transport.auth_mode == 'noauth' %] > <option value="noauth" selected="selected">No authentication</option> > [% ELSE %] > <option value="noauth">No authentication</option> >@@ -350,39 +350,39 @@ > </select> > </li> > <li> >- <label for="sftp_user_name" class="required">Username: </label> >- <input type="text" value="[% sftp_server.user_name | html %]" name="sftp_user_name" id="sftp_user_name" size="60" autocomplete="off" class="required" /> >+ <label for="user_name" class="required">Username: </label> >+ <input type="text" value="[% file_transport.user_name | html %]" name="user_name" id="user_name" size="60" autocomplete="off" class="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="sftp_password">Password: </label> >- <input type="password" value="[% sftp_server_plain_text_password | html %]" name="sftp_password" id="sftp_password" size="60" autocomplete="off" /> >+ <label for="password">Password: </label> >+ <input type="password" value="[% file_transport_plain_text_password | html %]" name="password" id="password" size="60" autocomplete="off" /> > </li> > <li> >- <label for="sftp_key_file">Key file path: </label> >- <textarea name="sftp_key_file" id="sftp_key_file" rows="10" cols="58">[% sftp_server_plain_text_key | html %]</textarea> >+ <label for="key_file">Key file path: </label> >+ <textarea name="key_file" id="key_file" rows="10" cols="58">[% file_transport_plain_text_key | html %]</textarea> > <span class="hint">Only applies to SFTP connections</span> > </li> > <li> >- <label for="sftp_download_directory">Remote download directory: </label> >- <input type="text" value="[% sftp_server.download_directory | html %]" name="sftp_download_directory" id="sftp_download_directory" size="60" autocomplete="off" /><br /> >+ <label for="download_directory">Remote download directory: </label> >+ <input type="text" value="[% file_transport.download_directory | html %]" name="download_directory" id="download_directory" size="60" autocomplete="off" /><br /> > <span class="hint">The path on the remote server where we will download from</span> > </li> > <li> >- <label for="sftp_upload_directory">Remote upload directory: </label> >- <input type="text" value="[% sftp_server.upload_directory | html %]" name="sftp_upload_directory" id="sftp_upload_directory" size="60" autocomplete="off" /><br /> >+ <label for="upload_directory">Remote upload directory: </label> >+ <input type="text" value="[% file_transport.upload_directory | html %]" name="upload_directory" id="upload_directory" size="60" autocomplete="off" /><br /> > <span class="hint">The path on the remote server where we will upload to</span> > </li> >- <input type="hidden" value="" name="sftp_status" id="sftp_status" /> >+ <input type="hidden" value="" name="status" id="status" /> > <li> >- <label for="sftp_debug_mode">Debug mode: </label> >- <select name="sftp_debug_mode" id="sftp_debug_mode"> >- [% IF sftp_server.debug == 1 %] >+ <label for="debug_mode">Debug mode: </label> >+ <select name="debug_mode" id="debug_mode"> >+ [% IF file_transport.debug == 1 %] > <option value="1" selected="selected">Enabled</option> > [% ELSE %] > <option value="1">Enabled</option> > [% END %] >- [% IF sftp_server.debug == 0 %] >+ [% IF file_transport.debug == 0 %] > <option value="0" selected="selected">Disabled</option> > [% ELSE %] > <option value="0">Disabled</option> >@@ -401,7 +401,7 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <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> >+ <a class="btn btn-default" id="new_file_transport" href="/cgi-bin/koha/admin/file_transports.pl?op=add_form"><i class="fa fa-plus"></i> New file transport</a> > </div> > > <h1>File transports</h1> >@@ -618,7 +618,7 @@ > { > "data": function(row, type, val, meta) { > let result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/file_transports.pl?op=edit_form&file_transport_id='+ encodeURIComponent(row.file_transport_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n"; >- 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.file_transport_id) +'" data-sftp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>'; >+ result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-bs-toggle="modal" data-bs-target="#delete_confirm_modal" data-file-transport-id="'+ encodeURIComponent(row.file_transport_id) +'" data-file-transport-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>'; > return result; > }, > "searchable": false, >@@ -636,43 +636,43 @@ > }); > > $('#file_transports').on("click", '.delete_server', function() { >- var file_transport_id = $(this).data('sftp-server-id'); >- var sftp_server_name = decodeURIComponent($(this).data('sftp-server-name')); >+ var file_transport_id = $(this).data('file-transport-id'); >+ var file_transport_name = decodeURIComponent($(this).data('file-transport-name')); > > $("#delete_confirm_dialog").html( >- _("You are about to delete the '%s' file transport.").format(sftp_server_name) >+ _("You are about to delete the '%s' file transport.").format(file_transport_name) > ); >- $("#delete_confirm_modal_button").data('sftp-server-id', file_transport_id); >- $("#delete_confirm_modal_button").data('sftp-server-name', sftp_server_name); >+ $("#delete_confirm_modal_button").data('file-transport-id', file_transport_id); >+ $("#delete_confirm_modal_button").data('file-transport-name', file_transport_name); > }); > > $("#delete_confirm_modal_button").on("click", function() { > >- var file_transport_id = $(this).data('sftp-server-id'); >- var sftp_server_name = $(this).data('sftp-server-name'); >+ var file_transport_id = $(this).data('file-transport-id'); >+ var file_transport_name = $(this).data('file-transport-name'); > > $.ajax({ > method: "DELETE", > url: "/api/v1/config/file_transports/"+file_transport_id > }).success(function() { > window.file_transports.api().ajax.reload(function(data) { >- $("#sftp_action_result_dialog").hide(); >- $("#sftp_delete_success").html(_("Server '%s' deleted successfully.").format(sftp_server_name)).show(); >+ $("#action_result_dialog").hide(); >+ $("#delete_success").html(_("Server '%s' deleted successfully.").format(file_transport_name)).show(); > }); > }).fail(function() { >- $("#sftp_delete_error").html(_("Error deleting server '%s'. Please ensure all linked EDI accounts are unlinked or deleted. Check the logs for details.").format(sftp_server_name)).show(); >+ $("#delete_error").html(_("Error deleting server '%s'. Please ensure all linked EDI accounts are unlinked or deleted. Check the logs for details.").format(file_transport_name)).show(); > }).done(function() { > $("#delete_confirm_modal").modal('hide'); > }); > }); > > transportChange(); >- $("#sftp_transport").on("change", function(event) { >+ $("#transport").on("change", function(event) { > transportChange(); > }); > > authModeChange(); >- $("#sftp_auth_mode").on("change", function(event) { >+ $("#auth_mode").on("change", function(event) { > authModeChange(); > }); > >@@ -714,73 +714,73 @@ > }); > > function transportChange() { >- let sftp_transport = $("#sftp_transport"); >- >- if(sftp_transport.val() == "ftp") { >- $("#sftp_host").removeAttr("disabled"); >- $("#sftp_port").removeAttr("disabled"); >- $("#sftp_passive").removeAttr("disabled"); >- $("#sftp_auth_mode").removeAttr("disabled"); >- $("#sftp_user_name").removeAttr("disabled"); >- $("#sftp_password").removeAttr("disabled"); >- $("#sftp_key_file").attr("disabled", "disabled"); >- >- $("#sftp_auth_mode option[value='password']").removeAttr("disabled"); >- $("#sftp_auth_mode option[value='key_file']").attr("disabled", "disabled"); >- $("#sftp_auth_mode option[value='noauth']").removeAttr("disabled"); >- if($("#sftp_auth_mode option:selected").val() == "key_file") { >- $("#sftp_auth_mode option[value='password']").prop("selected", true); >+ let transport = $("#transport"); >+ >+ if(transport.val() == "ftp") { >+ $("#host").removeAttr("disabled"); >+ $("#port").removeAttr("disabled"); >+ $("#passive").removeAttr("disabled"); >+ $("#auth_mode").removeAttr("disabled"); >+ $("#user_name").removeAttr("disabled"); >+ $("#password").removeAttr("disabled"); >+ $("#key_file").attr("disabled", "disabled"); >+ >+ $("#auth_mode option[value='password']").removeAttr("disabled"); >+ $("#auth_mode option[value='key_file']").attr("disabled", "disabled"); >+ $("#auth_mode option[value='noauth']").removeAttr("disabled"); >+ if($("#auth_mode option:selected").val() == "key_file") { >+ $("#auth_mode option[value='password']").prop("selected", true); > } > >- let sftp_port = $("#sftp_port").val(); >- if(sftp_port == 22) $("#sftp_port").val("21"); >+ let port = $("#port").val(); >+ if(port == 22) $("#port").val("21"); > > authModeChange(); >- } else if(sftp_transport.val() == "sftp") { >- $("#sftp_host").removeAttr("disabled"); >- $("#sftp_port").removeAttr("disabled"); >- $("#sftp_passive").attr("disabled", "disabled"); >- $("#sftp_auth_mode").removeAttr("disabled"); >- $("#sftp_user_name").removeAttr("disabled"); >- $("#sftp_password").removeAttr("disabled"); >- $("#sftp_key_file").removeAttr("disabled"); >- >- $("#sftp_auth_mode option[value='password']").removeAttr("disabled"); >- $("#sftp_auth_mode option[value='key_file']").removeAttr("disabled"); >- $("#sftp_auth_mode option[value='noauth']").removeAttr("disabled"); >- $("#sftp_passive option[value='1']").prop("selected", true); >- >- let sftp_port = $("#sftp_port").val(); >- if(sftp_port == 21) $("#sftp_port").val("22"); >+ } else if(transport.val() == "sftp") { >+ $("#host").removeAttr("disabled"); >+ $("#port").removeAttr("disabled"); >+ $("#passive").attr("disabled", "disabled"); >+ $("#auth_mode").removeAttr("disabled"); >+ $("#user_name").removeAttr("disabled"); >+ $("#password").removeAttr("disabled"); >+ $("#key_file").removeAttr("disabled"); >+ >+ $("#auth_mode option[value='password']").removeAttr("disabled"); >+ $("#auth_mode option[value='key_file']").removeAttr("disabled"); >+ $("#auth_mode option[value='noauth']").removeAttr("disabled"); >+ $("#passive option[value='1']").prop("selected", true); >+ >+ let port = $("#port").val(); >+ if(port == 21) $("#port").val("22"); > > return authModeChange(); > } > } > > function authModeChange() { >- let sftp_auth_mode = $("#sftp_auth_mode").val(); >- >- if(sftp_auth_mode == "password") { >- $("#sftp_password").removeAttr("disabled"); >- $("#sftp_key_file").attr("disabled", "disabled"); >- } else if(sftp_auth_mode == "key_file") { >- $("#sftp_password").attr("disabled", "disabled"); >- $("#sftp_key_file").removeAttr("disabled"); >+ let auth_mode = $("#auth_mode").val(); >+ >+ if(auth_mode == "password") { >+ $("#password").removeAttr("disabled"); >+ $("#key_file").attr("disabled", "disabled"); >+ } else if(auth_mode == "key_file") { >+ $("#password").attr("disabled", "disabled"); >+ $("#key_file").removeAttr("disabled"); > } else { >- $("#sftp_password").attr("disabled", "disabled"); >- $("#sftp_key_file").attr("disabled", "disabled"); >+ $("#password").attr("disabled", "disabled"); >+ $("#key_file").attr("disabled", "disabled"); > } > } > > function modalChange() { > $('#modal_message').hide(); >- if ( $('#sftp_transport').val() == 'sftp' ) $('#modal_message').show(); >+ if ( $('#transport').val() == 'sftp' ) $('#modal_message').show(); > >- $('#modal_host').text( $('#sftp_host').val() ); >- $('#modal_port').text( $('#sftp_port').val() ); >- $('#modal_transport').text( $('#sftp_transport option:selected').text() ); >- $('#modal_user_name').text( $('#sftp_user_name').val() ); >- $('#modal_auth_mode').text( $('#sftp_auth_mode option:selected').text() ); >+ $('#modal_host').text( $('#host').val() ); >+ $('#modal_port').text( $('#port').val() ); >+ $('#modal_transport').text( $('#transport option:selected').text() ); >+ $('#modal_user_name').text( $('#user_name').val() ); >+ $('#modal_auth_mode').text( $('#auth_mode option:selected').text() ); > } > </script> > [% END %] >-- >2.39.5 (Apple Git-154)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38489
:
175204
|
175205
|
175206
|
175207
|
176118
|
176119
|
176161
|
185324
|
186819
|
186820
|
186845
|
186846
|
186847
|
186848
|
186849
|
186850
|
186851
|
186852
|
186854
|
187080
|
187081
|
187082
|
187083
|
187084
|
187085
|
187086
|
187087
|
187088
|
187089
|
187108
|
187147
|
187148
|
187149
|
187150
|
187151
|
187152
|
187153
|
187154
|
187155
|
187156
|
187157
|
187158
|
187159
|
187270
|
187271
|
187272
|
187273
|
187274
|
187275
|
187276
|
187277
|
187278
|
187279
|
187280
|
187281
|
187283
|
187284
|
187285
|
187286
|
187287
|
187288
|
187289
|
187290
|
187291
|
187292
|
187293
|
187294