Rename label of server field, and handle paths without suffix slashes…

… on s3
duplicati · Nov 15, 2024 · 9dcb69c · 9dcb69c
1 parent 7fdf34e
commit 9dcb69c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/backup/destination/destination.config.ts b/src/app/backup/destination/destination.config.ts
@@ -104,12 +104,13 @@ export const DESTINATION_CONFIG: DestinationConfig = {
       },
     },
     dynamicFields: [
-      'use-ssl',
       {
         name: 's3-server-name',
+        shortDescription: 'Server',
         type: 'NonValidatedSelectableString', // Convert to string before submitting
         loadOptions: (injector: Injector) => injector.get(WebModulesService).s3Providers,
       },
+      'use-ssl',
       'auth-username',
       'auth-password',
     ],

diff --git a/src/app/backup/destination/destination.mapper.ts b/src/app/backup/destination/destination.mapper.ts
@@ -84,7 +84,7 @@ const mappings = {
     to: (fields: any): string => {
       const urlParams = toSearchParams([...Object.entries(fields.advanced), ...Object.entries(fields.dynamic)]);
 
-      return `${fields.destinationType}://${fields.custom.bucket}${fields.custom.path}${urlParams}`;
+      return `${fields.destinationType}://${fields.custom.bucket}${fields.custom.path.startsWith('/') ? fields.custom.path : '/' + fields.custom.path}${urlParams}`;
     },
     from: (destinationType: string, urlObj: URL, plainPath: string) => {
       return <ValueOfDestinationFormGroup>{