Merge branch 'master' into NAS-132920

truenas · Dec 10, 2024 · 0c5945b · 0c5945b
2 parents 86caa83 + a155cc0
commit 0c5945b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/app/pages/data-protection/rsync-task/rsync-task-form/rsync-task-form.component.spec.ts b/src/app/pages/data-protection/rsync-task/rsync-task-form/rsync-task-form.component.spec.ts
@@ -159,6 +159,7 @@ describe('RsyncTaskFormComponent', () => {
         recursive: false,
         remotehost: 'pentagon.gov',
         remotemodule: 'module',
+        ssh_credentials: null,
         schedule: {
           dom: '*', dow: '*', hour: '2', minute: '0', month: '*',
         },
@@ -228,6 +229,7 @@ describe('RsyncTaskFormComponent', () => {
           ...existingTask,
           path: '/mnt/new',
           direction: Direction.Push,
+          ssh_credentials: null,
           times: false,
           compress: false,
           delayupdates: true,

diff --git a/src/app/pages/data-protection/rsync-task/rsync-task-form/rsync-task-form.component.ts b/src/app/pages/data-protection/rsync-task/rsync-task-form/rsync-task-form.component.ts
@@ -191,8 +191,8 @@ export class RsyncTaskFormComponent implements OnInit {
       delete values.remoteport;
       delete values.remotepath;
       delete values.validate_rpath;
-      delete values.ssh_credentials;
       delete values.ssh_keyscan;
+      values.ssh_credentials = null;
     } else {
       delete values.remotemodule;
       if (values.sshconnectmode === RsyncSshConnectMode.PrivateKey) {