Skip to content

Commit b8a13a4

Browse files
author
roadiz-ci
committed
chore: Bumped
1 parent 3a5a3ec commit b8a13a4

31 files changed

Lines changed: 907 additions & 267 deletions

‎composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"prefer-stable": true,
2121
"require": {
2222
"php": ">=8.2",
23-
"roadiz/compat-bundle": "2.4.*",
24-
"roadiz/core-bundle": "2.4.*",
25-
"roadiz/openid": "2.4.*",
26-
"roadiz/rozier": "2.4.*",
23+
"roadiz/compat-bundle": "2.5.*",
24+
"roadiz/core-bundle": "2.5.*",
25+
"roadiz/openid": "2.5.*",
26+
"roadiz/rozier": "2.5.*",
2727
"symfony/framework-bundle": "6.4.*"
2828
},
2929
"require-dev": {
@@ -52,8 +52,8 @@
5252
},
5353
"extra": {
5454
"branch-alias": {
55-
"dev-main": "2.4.x-dev",
56-
"dev-develop": "2.5.x-dev"
55+
"dev-main": "2.5.x-dev",
56+
"dev-develop": "2.6.x-dev"
5757
}
5858
}
5959
}

‎config/routing.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ nodeTypeFieldsRoutes:
5252
resource: "routing/node-type-fields.yml"
5353
prefix: /rz-admin/node-types/fields
5454

55+
# Node type DECORATORS
56+
nodeTypeDecoratorsRoutes:
57+
resource: "routing/node-type-decorators.yml"
58+
prefix: /rz-admin/node-types/decorators
59+
5560
# SETTINGS
5661
settingsHomePage:
5762
path: /rz-admin/settings
@@ -198,9 +203,9 @@ searchNodePage:
198203
path: /rz-admin/search
199204
controller: Themes\Rozier\Controllers\SearchController::searchNodeAction
200205
searchNodeSourcePage:
201-
path: /rz-admin/search/{nodetypeId}
206+
path: /rz-admin/search/{nodeTypeName}
202207
controller: Themes\Rozier\Controllers\SearchController::searchNodeSourceAction
203-
requirements: { nodetypeId : "[0-9]+" }
208+
requirements: { nodeTypeName : "[a-zA-Z]+" }
204209

205210
webhooksHomePage:
206211
path: /rz-admin/webhooks
@@ -216,5 +221,5 @@ webhooksRoutes:
216221
#
217222
loginImagePage:
218223
path: /css/login/image
219-
controller: Themes\Rozier\Controllers\LoginController::imageAction
224+
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginImageController::imageAction
220225

‎config/routing/ajax.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ nodesAjaxExplorerPage:
5050
defaults:
5151
_controller: Themes\Rozier\AjaxControllers\AjaxNodesExplorerController::indexAction
5252
_format: json
53-
nodeTypesFieldAjaxEdit:
54-
path: /node-types/fields/edit/{nodeTypeFieldId}
55-
defaults:
56-
_controller: Themes\Rozier\AjaxControllers\AjaxNodeTypeFieldsController::editAction
57-
_format: json
58-
requirements: { nodeTypeFieldId : "[0-9]+" }
5953
nodeTypesAjaxByArray:
6054
path: /node-types/list
6155
methods: [GET]

‎config/routing/documents.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
documentsAdjustPage:
22
path: /adjust/{documentId}
33
defaults:
4-
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::adjustAction
4+
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentAdjustController::adjustAction
55
requirements: { documentId : "[0-9]+" }
66
documentsEditPage:
77
path: /edit/{documentId}
88
defaults:
9-
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::editAction
9+
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEditController::editAction
1010
requirements: { documentId : "[0-9]+" }
1111
documentsLimitationsPage:
1212
path: /limitations/{id}
@@ -37,7 +37,7 @@ documentsDownloadInlinePage:
3737
documentsUsagePage:
3838
path: /usage/{documentId}
3939
defaults:
40-
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::usageAction
40+
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentUsageController::usageAction
4141
requirements: { documentId : "[0-9]+" }
4242
documentsUploadPage:
4343
path: /upload/{_format}/{folderId}
@@ -51,13 +51,13 @@ documentsUploadPage:
5151
documentsRandomPage:
5252
path: /random/{folderId}
5353
defaults:
54-
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::randomAction
54+
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEmbedController::randomAction
5555
folderId: null
5656
requirements: { folderId : "[0-9]+" }
5757
documentsEmbedPage:
5858
path: /embed/{folderId}
5959
defaults:
60-
_controller: Themes\Rozier\Controllers\Documents\DocumentsController::embedAction
60+
_controller: RZ\Roadiz\RozierBundle\Controller\Document\DocumentEmbedController::embedAction
6161
folderId: null
6262
requirements: { folderId : "[0-9]+" }
6363
documentsDeletePage:

‎config/routing/login.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ loginRequestConfirmPage:
77
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginRequestController::confirmAction
88
loginResetConfirmPage:
99
path: /login/reset/confirm
10-
controller: Themes\Rozier\Controllers\LoginResetController::confirmAction
10+
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginResetController::confirmAction
1111
loginResetPage:
1212
path: /login/reset/{token}
13-
controller: Themes\Rozier\Controllers\LoginResetController::resetAction
13+
controller: RZ\Roadiz\RozierBundle\Controller\Login\LoginResetController::resetAction
1414
requirements: { token : "[^\\/]+" }
1515

1616
# Override legacy Rozier routes for security

‎config/routing/node-type-decorators.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
nodeTypeDecoratorsListPage:
3+
path: /
4+
defaults:
5+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypeDecoratorController::defaultAction
6+
requirements: { nodeTypeName : "[a-zA-Z]+" }
7+
nodeTypeDecoratorsAddPage:
8+
path: /add
9+
defaults:
10+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypeDecoratorController::addAction
11+
nodeTypeDecoratorsEditPage:
12+
path: /edit/{id}
13+
defaults:
14+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypeDecoratorController::editAction
15+
requirements: { id : "[0-9]+" }
16+
nodeTypeDecoratorsDeletePage:
17+
path: /delete/{id}
18+
defaults:
19+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypeDecoratorController::deleteAction
20+
requirements: { id : "[0-9]+" }
21+

‎config/routing/node-type-fields.yml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
---
22
nodeTypeFieldsListPage:
3-
path: /{nodeTypeId}
3+
path: /{nodeTypeName}
44
defaults:
55
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::listAction
6-
requirements: { nodeTypeId : "[0-9]+" }
7-
nodeTypeFieldsEditPage:
8-
path: /edit/{nodeTypeFieldId}
9-
defaults:
10-
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::editAction
11-
requirements: { nodeTypeFieldId : "[0-9]+" }
12-
nodeTypeFieldsAddPage:
13-
path: /add/{nodeTypeId}
14-
defaults:
15-
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::addAction
16-
requirements: { nodeTypeId : "[0-9]+" }
17-
nodeTypeFieldsDeletePage:
18-
path: /delete/{nodeTypeFieldId}
19-
defaults:
20-
_controller: Themes\Rozier\Controllers\NodeTypeFieldsController::deleteAction
21-
requirements: { nodeTypeFieldId : "[0-9]+" }
22-
6+
requirements: { nodeTypeName : "[a-zA-Z]+" }

‎config/routing/node-types.yml‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,11 @@
22
# Node-types admin pages
33
# These routes are prefixed with /rz-admin/node-types
44
#
5-
nodeTypesEditPage:
6-
path: /edit/{nodeTypeId}
7-
defaults:
8-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::editAction
9-
requirements: { nodeTypeId : "[0-9]+" }
10-
nodeTypesAddPage:
11-
path: /add
12-
defaults:
13-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::addAction
14-
nodeTypesImportPage:
15-
path: /import
16-
defaults:
17-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::importJsonFileAction
18-
nodeTypesDeletePage:
19-
path: /delete/{nodeTypeId}
20-
defaults:
21-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesController::deleteAction
22-
requirements: { nodeTypeId : "[0-9]+" }
23-
nodesTypesExportPage:
24-
path: /export/{nodeTypeId}
25-
defaults:
26-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportJsonFileAction
27-
requirements: { nodeTypeId : "[0-9]+" }
28-
nodesTypesExportAllPage:
29-
path: /export/all
30-
defaults:
31-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportAllAction
325
nodesTypesExportDocumentationPage:
336
path: /export/documentation
347
defaults:
35-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportDocumentationAction
8+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesExportController::exportDocumentationAction
369
nodesTypesExportTypeScriptPage:
3710
path: /export/typescript
3811
defaults:
39-
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesUtilsController::exportTypeScriptDeclarationAction
12+
_controller: Themes\Rozier\Controllers\NodeTypes\NodeTypesExportController::exportTypeScriptDeclarationAction

‎config/routing/nodes.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ nodesEditTagsPage:
7272
_controller: RZ\Roadiz\RozierBundle\Controller\Node\NodesTagsController::editTagsAction
7373
requirements: { nodeId : "[0-9]+" }
7474
nodesRemoveStackTypePage:
75-
path: /edit/{nodeId}/stacktype/{typeId}/remove
75+
path: /edit/{nodeId}/stacktype/{typeName}/remove
7676
methods: [POST]
7777
defaults:
7878
_controller: Themes\Rozier\Controllers\Nodes\NodesController::removeStackTypeAction
79-
requirements: { nodeId : "[0-9]+", typeId : "[0-9]+" }
79+
requirements: { nodeId : "[0-9]+", typeName : "[a-zA-Z]+" }
8080
nodesEditSEOPage:
8181
path: /edit/{nodeId}/seo/{translationId}
8282
defaults:
@@ -108,10 +108,10 @@ nodesBulkStatusPage:
108108
defaults:
109109
_controller: Themes\Rozier\Controllers\Nodes\NodesTreesController::bulkStatusAction
110110
nodesAddPage:
111-
path: /add/{nodeTypeId}/{translationId}
111+
path: /add/{translationId}
112112
defaults:
113113
_controller: Themes\Rozier\Controllers\Nodes\NodesController::addAction
114-
requirements: { nodeTypeId : "[0-9]+", translationId : "[0-9]+" }
114+
requirements: { translationId : "[0-9]+" }
115115
nodesAddChildPage:
116116
path: /add-child/{nodeId}
117117
defaults:
@@ -147,7 +147,7 @@ nodesExportNodeCsvPage:
147147
nodesDuplicatePage:
148148
path: /duplicate/{nodeId}
149149
defaults:
150-
_controller: Themes\Rozier\Controllers\Nodes\NodesUtilsController::duplicateAction
150+
_controller: Themes\Rozier\Controllers\Nodes\NodesDuplicateController::duplicateAction
151151
requirements: { nodeId : "[0-9]+" }
152152
nodesEmptyTrashPage:
153153
path: /empty-trash

‎config/routing/roles.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rolesDeletePage:
1515
rolesExportAllPage:
1616
path: /export
1717
defaults:
18-
_controller: Themes\Rozier\Controllers\RolesController::exportAction
18+
_controller: Themes\Rozier\Controllers\RolesUtilsController::exportAllAction
1919
rolesExportPage:
2020
path: /export/{id}
2121
requirements: { id : "[0-9]+" }

0 commit comments

Comments
 (0)