Changeset 7479

Timestamp:

Apr 16, 2018, 2:15:32 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2112: Add support for SSH private keys to file server items

Fixed the "remove existing private key" checkbox so that it removes the key and disables the other controls.

Renamed the "HTTPS certificates" tab to "HTTPS options".

Location:

trunk/www/filemanager/fileservers

Files:

• edit_fileserver.jsp (modified) (3 diffs)
• fileservers.js (modified) (4 diffs)

trunk/www/filemanager/fileservers/edit_fileserver.jsp

@@ -88 +88 @@
       extensions="<%=invoker%>">
     <t:tab id="info" title="File server" helpid="fileserver.edit">
-      <table class="fullform input100">
+      <table class="fullform input100 larger">
       <tr>
         <th>Name</th>
@@ -180 +180 @@
       </table>
     </t:tab>
-    <t:tab id="serverCertificate" title="HTTPS certificates" 
+    <t:tab id="httpsOptions" title="HTTPS options" 
       helpid="fileserver.edit">
       
-      <table class="fullform input100">
+      <table class="fullform input100 larger">
       <tr class="big">
         <th>Server certificate</th>
@@ -228 +228 @@
     <t:tab id="sshOptions" title="SSH options" 
       helpid="fileserver.edit">
-      <table class="fullform input100">
+      <table class="fullform input100 larger">
       <tr>
         <th>SSH fingerprint</th>

trunk/www/filemanager/fileservers/fileservers.js

@@ -42 +42 @@
       // Tab validation
       TabControl.addTabValidator('settings.info', fileServers.validateFileServer);
-      TabControl.addTabValidator('settings.serverCertificate', fileServers.validateCertificates);
+      TabControl.addTabValidator('settings.httpsOptions', fileServers.validateHttpsOptions);
       TabControl.addTabValidator('settings.sshOptions', fileServers.validateSshOptions);
       
@@ -52 +52 @@
       Events.addEventHandler('removeServerCertificate', 'click', fileServers.removeServerCertificateOnClick);
       Events.addEventHandler('removeClientCertificate', 'click', fileServers.removeClientCertificateOnClick);
+      Events.addEventHandler('removeSshPrivateKey', 'click', fileServers.removeSshPrivateKeyOnClick);
       
     }
@@ -112 +113 @@
   }
   
-  fileServers.validateCertificates = function()
+  fileServers.validateHttpsOptions = function()
   {
     return true;
@@ -184 +185 @@
   }
 
+  fileServers.removeSshPrivateKeyOnClick = function()
+  {
+    var frm = document.forms['server'];
+    if (frm.remove_ssh_private_key.checked)
+    {
+      frm.ssh_private_key.value = '';
+      frm.ssh_private_key.disabled = true;
+      frm.ssh_private_key_password.disabled = true;
+      frm.ssh_private_key_format.disabled = true;
+    }
+    else
+    {
+      frm.ssh_private_key.disabled = false;
+      frm.ssh_private_key_password.disabled = false;
+      frm.ssh_private_key_format.disabled = false;
+    }
+  }
 
   return fileServers;