Skip to content

Commit 003d5ec

Browse files
committed
Merge remote-tracking branch 'origin/2026.1' into 2026.x
2 parents 645a1e8 + 2a59e84 commit 003d5ec

36 files changed

Lines changed: 17 additions & 1774 deletions

.github/workflows/codeception.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- "[0-9]+.[0-9]+"
1010
- "[0-9]+.x"
1111
- "feature-*"
12-
pull_request_target:
12+
pull_request:
1313
types: [opened, synchronize, reopened]
1414

1515
env:

.github/workflows/new-static-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
schedule:
55
- cron: '0 3 * * 1,3,5'
66
workflow_dispatch:
7-
pull_request_target:
7+
pull_request:
88
types: [ opened, synchronize, reopened ]
99
paths-ignore:
1010
- 'assets/**'

assets/studio/js/src/modules/data-importer/dynamic-types/transformer/import-asset/import-asset-transformer-form.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
import React from 'react'
12-
import { Input, Form, Switch } from '@pimcore/studio-ui-bundle/components'
12+
import { Input, Form, ManyToOneRelationPath, Switch } from '@pimcore/studio-ui-bundle/components'
1313
import { TransformerSettingsLayout } from '../transformer-settings-layout'
1414

1515
interface ImportAssetTransformerConfig {
@@ -35,9 +35,12 @@ export const ImportAssetTransformerForm = ({ settings, onChange }: ImportAssetTr
3535
className={ styles.formItem }
3636
label={ <span className={ styles.label }>Parent folder</span> }
3737
>
38-
<Input
39-
onChange={ (e) => { update('parentFolder', e.target.value) } }
40-
placeholder="/"
38+
<ManyToOneRelationPath
39+
allowPathTextInput
40+
allowToClearRelation
41+
allowedAssetTypes={ ['folder'] }
42+
assetsAllowed
43+
onChange={ (val) => { update('parentFolder', val ?? '/') } }
4144
value={ settings.parentFolder ?? '/' }
4245
/>
4346
</Form.Item>
@@ -53,7 +56,7 @@ export const ImportAssetTransformerForm = ({ settings, onChange }: ImportAssetTr
5356

5457
<Form.Item className={ styles.formItemSwitch }>
5558
<Switch
56-
checked={ settings.overwriteExisting !== false }
59+
checked={ settings.overwriteExisting === true }
5760
labelRight="Overwrite existing"
5861
onChange={ (v) => { update('overwriteExisting', v) } }
5962
size="small"

src/Resources/public/studio/build/5c122884-73a6-41ce-9c4d-cc70228112b3/entrypoints.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/Resources/public/studio/build/5c122884-73a6-41ce-9c4d-cc70228112b3/exposeRemote.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/Resources/public/studio/build/5c122884-73a6-41ce-9c4d-cc70228112b3/main.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Resources/public/studio/build/5c122884-73a6-41ce-9c4d-cc70228112b3/manifest.json

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)