Skip to content

Commit 7fbd2cd

Browse files
GuiteGuite
committed
remove old UrlExtensions
1 parent 9300e72 commit 7fbd2cd

29 files changed

Lines changed: 87 additions & 236 deletions

File tree

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/FormHandlerOLD.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,12 @@ class FormHandlerOLD {
348348
$routePrefix = '«app.routePrefix»_' . mb_strtolower($this->objectType) . '_';
349349
$userDetailUrl = $this->router->generate(
350350
$routePrefix . 'detail',
351-
$entity->createUrlArgs(),
351+
$entity->getRouteParameters(),
352352
UrlGeneratorInterface::ABSOLUTE_URL
353353
);
354354
$adminDetailUrl = $this->router->generate(
355355
$routePrefix . 'admindetail',
356-
$entity->createUrlArgs(),
356+
$entity->getRouteParameters(),
357357
UrlGeneratorInterface::ABSOLUTE_URL
358358
);
359359
if ($this->returnTo === $userDetailUrl) {

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/action/ApplyTreeOperation.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ class ApplyTreeOperation extends AbstractAction {
283283
$data['result'] = 'failure';
284284
} elseif (in_array($objectType, ['«entitiesWithEditableTree.map[name.formatForCode].join('\', \'')»'], true)) {
285285
«IF !treeEntities.filter[hasEditAction && hasSluggableFields].empty»
286-
$urlArgs = $isSluggable ? $childEntity->createUrlArgs(true) : $childEntity->createUrlArgs();
286+
$urlArgs = $isSluggable ? $childEntity->getRouteParameters(includeId: true) : $childEntity->getRouteParameters();
287287
«ELSE»
288-
$urlArgs = $childEntity->createUrlArgs();
288+
$urlArgs = $childEntity->getRouteParameters();
289289
«ENDIF»
290290
$data['returnUrl'] = $this->router->generate(
291291
$redirectRoute,

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/action/LoggableHistory.xtend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class LoggableHistory extends AbstractAction {
186186
187187
return $this->controllerHelper->redirectToRoute(
188188
$redirectRoute,
189-
$entity->createUrlArgs()
189+
$entity->getRouteParameters()
190190
);
191191
}
192192

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/action/LoggableUndelete.xtend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class LoggableUndelete extends AbstractAction {
148148
149149
$redirectRouteParameters = [];
150150
if (str_ends_with($redirectRoute, 'detail')) {
151-
$redirectRouteParameters = $entity->createUrlArgs();
151+
$redirectRouteParameters = $entity->getRouteParameters();
152152
}
153153
154154
return $this->redirectToRoute($redirectRoute, $redirectRouteParameters);

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/actionhandler/Redirect.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class Redirect {
121121

122122
if ($objectIsPersisted) {
123123
// redirect to the detail page of treated «name.formatForCode»
124-
$url = $this->router->generate($routePrefix . 'detail', $this->entityRef->createUrlArgs());
124+
$url = $this->router->generate($routePrefix . 'detail', $this->entityRef->getRouteParameters());
125125
}
126126
«ENDIF»
127127

@@ -196,7 +196,7 @@ class Redirect {
196196
'delete' !== $args['commandName']
197197
&& !('create' === $this->templateParameters['mode'] && 'cancel' === $args['commandName'])
198198
) {
199-
return $this->router->generate($routePrefix . 'detail', $this->entityRef->createUrlArgs());
199+
return $this->router->generate($routePrefix . 'detail', $this->entityRef->getRouteParameters());
200200
}
201201

202202
return $this->getDefaultReturnUrl($args);

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/helper/NotificationHelper.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,15 +377,15 @@ class NotificationHelper {
377377
$hasEditAction = in_array($objectType, ['«entities.filter[hasEditAction].map[name.formatForCode].join('\', \'')»'], true);
378378
$routePrefix = '«routePrefix»_' . mb_strtolower($objectType) . '_';
379379
380-
$urlArgs = $this->entity->createUrlArgs();
380+
$urlArgs = $this->entity->getRouteParameters();
381381
$detailUrl = $hasDetailAction
382382
? $this->router->generate($routePrefix . 'detail', $urlArgs, UrlGeneratorInterface::ABSOLUTE_URL)
383383
: ''
384384
;
385385
386386
«IF !entities.filter[hasEditAction && hasSluggableFields].empty»
387387
$needsArg = in_array($objectType, ['«entities.filter[hasEditAction && hasSluggableFields].map[name.formatForCode].join('\', \'')»'], true);
388-
$urlArgs = $needsArg ? $this->entity->createUrlArgs(true) : $this->entity->createUrlArgs();
388+
$urlArgs = $needsArg ? $this->entity->getRouteParameters(true) : $this->entity->getRouteParameters();
389389
«ENDIF»
390390
$editUrl = $hasEditAction
391391
? $this->router->generate($routePrefix . 'edit', $urlArgs, UrlGeneratorInterface::ABSOLUTE_URL)

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/menu/ItemActions.xtend‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ItemActions {
4848
def private itemActionsTargetingDetail(Entity it, Application app) '''
4949
«IF hasDetailAction»
5050
if ('admin' === $routeArea) {
51-
$previewRouteParameters = $entity->createUrlArgs();
51+
$previewRouteParameters = $entity->getRouteParameters();
5252
$previewRouteParameters['preview'] = 1;
5353
$menu->addChild('Preview', [
5454
'route' => $routePrefix . 'detail',
@@ -64,7 +64,7 @@ class ItemActions {
6464
$entityTitle = $this->entityDisplayHelper->getFormattedTitle($entity);
6565
$menu->addChild('Details', [
6666
'route' => $routePrefix . 'detail',
67-
'routeParameters' => $entity->createUrlArgs(),
67+
'routeParameters' => $entity->getRouteParameters(),
6868
])
6969
->setLinkAttribute('title', str_replace('"', '', $entityTitle))
7070
«app.addLinkClass('secondary')»
@@ -92,7 +92,7 @@ class ItemActions {
9292
if (in_array($context, ['index', 'detail'], true) && $this->loggableHelper->hasHistoryItems($entity)) {
9393
$menu->addChild('History', [
9494
'route' => $routePrefix . 'loggablehistory',
95-
'routeParameters' => $entity->createUrlArgs(),
95+
'routeParameters' => $entity->getRouteParameters(),
9696
])
9797
->setLinkAttribute('title', 'Watch version history')
9898
«app.addLinkClass('secondary')»
@@ -105,7 +105,7 @@ class ItemActions {
105105
if ($this->permissionHelper->mayDelete($entity)«IF ownerPermission» || ($isOwner && $this->permissionHelper->mayEdit($entity))«ENDIF») {
106106
$menu->addChild('Delete', [
107107
'route' => $routePrefix . 'delete',
108-
'routeParameters' => $entity->createUrlArgs(),
108+
'routeParameters' => $entity->getRouteParameters(),
109109
])
110110
->setLinkAttribute('title', 'Delete this «name.formatForDisplay»')
111111
«app.addLinkClass('danger')»
@@ -173,7 +173,7 @@ class ItemActions {
173173
def private itemActionsForEditAction(Entity it) '''
174174
$menu->addChild('Edit', [
175175
'route' => $routePrefix . 'edit',
176-
'routeParameters' => $entity->createUrlArgs(«IF hasSluggableFields»true«ENDIF»),
176+
'routeParameters' => $entity->getRouteParameters(«IF hasSluggableFields»includeId: true«ENDIF»),
177177
])
178178
->setLinkAttribute('title', 'Edit this «name.formatForDisplay»')
179179
«application.addLinkClass('secondary')»

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/models/entity/EntityMethods.xtend‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class EntityMethods {
2323
def generate(Entity it, Application app, Property thProp) '''
2424
«validationMethods»
2525

26-
«createUrlArgs»
26+
«getRouteParameters»
2727

2828
«getKey»
2929

@@ -44,28 +44,25 @@ class EntityMethods {
4444
«ENDIF»
4545
'''
4646

47-
def private createUrlArgs(Entity it) '''
47+
def private getRouteParameters(Entity it) '''
4848
/**
4949
* Creates url arguments array for easy creation of display urls.
5050
*/
51-
public function createUrlArgs(«IF hasSluggableFields»bool $forEditing = false«ENDIF»): array
51+
public function getRouteParameters(array $params = []«IF hasSluggableFields», bool $includeId = false«ENDIF»): array
5252
{
5353
«IF hasSluggableFields»
54-
if (true === $forEditing) {
55-
return [
56-
'«getPrimaryKey.name.formatForCode»' => $this->get«getPrimaryKey.name.formatForCodeCapital»(),
57-
'slug' => $this->getSlug(),
58-
];
59-
}
54+
$slug = $this->getSlug();
6055

61-
return [
62-
'slug' => $this->getSlug(),
63-
];
56+
if ($includeId || null === $slug || '' === $slug) {
57+
$params['«getPrimaryKey.name.formatForCode»'] = $this->getKey();
58+
} else {
59+
$params['slug'] = $slug;
60+
}
6461
«ELSE»
65-
return [
66-
'«getPrimaryKey.name.formatForCode»' => $this->get«getPrimaryKey.name.formatForCodeCapital»(),
67-
];
62+
$params['«getPrimaryKey.name.formatForCode»'] = $this->getKey();
6863
«ENDIF»
64+
65+
return $params;
6966
}
7067
'''
7168

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/formcomponents/Relations.xtend‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.zikula.modulestudio.generator.extensions.FormattingExtensions
1212
import org.zikula.modulestudio.generator.extensions.ModelExtensions
1313
import org.zikula.modulestudio.generator.extensions.ModelJoinExtensions
1414
import org.zikula.modulestudio.generator.extensions.NamingExtensions
15-
import org.zikula.modulestudio.generator.extensions.UrlExtensions
1615
import org.zikula.modulestudio.generator.extensions.Utils
1716
import org.zikula.modulestudio.generator.extensions.ViewExtensions
1817

@@ -23,7 +22,6 @@ class Relations {
2322
extension ModelExtensions = new ModelExtensions
2423
extension ModelJoinExtensions = new ModelJoinExtensions
2524
extension NamingExtensions = new NamingExtensions
26-
extension UrlExtensions = new UrlExtensions
2725
extension ViewExtensions = new ViewExtensions
2826
extension Utils = new Utils
2927

@@ -199,7 +197,7 @@ class Relations {
199197
<li id="{{ idPrefixItem }}">
200198
{{ item|«app.appName.formatForDB»_formattedTitle }}
201199
«IF includeEditing»
202-
<a id="{{ idPrefixItem }}Edit" href="{{ path('«targetEntity.route('edit')»'«targetEntity.routeParams('item', true)») }}"><i class="fas fa-edit"></i></a>
200+
<a id="{{ idPrefixItem }}Edit" href="{{ path('«targetEntity.route('edit')»', item.getRouteParameters()) }}"><i class="fas fa-edit"></i></a>
203201
«ENDIF»
204202
<a id="{{ idPrefixItem }}Remove" href="javascript:«app.vendorAndName»RemoveRelatedItem('{{ idPrefix }}', '{{ item.getKey() }}');"><i class="fas fa-trash-alt"></i></a>
205203
«IF targetEntity.hasImageFieldsEntity»

‎bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/pagecomponents/Relations.xtend‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
1010
import org.zikula.modulestudio.generator.extensions.ModelExtensions
1111
import org.zikula.modulestudio.generator.extensions.ModelJoinExtensions
1212
import org.zikula.modulestudio.generator.extensions.NamingExtensions
13-
import org.zikula.modulestudio.generator.extensions.UrlExtensions
1413
import org.zikula.modulestudio.generator.extensions.Utils
1514

1615
class Relations {
@@ -21,7 +20,6 @@ class Relations {
2120
extension ModelExtensions = new ModelExtensions
2221
extension ModelJoinExtensions = new ModelJoinExtensions
2322
extension NamingExtensions = new NamingExtensions
24-
extension UrlExtensions = new UrlExtensions
2523
extension Utils = new Utils
2624

2725
def displayItemList(Entity it, Application app, Boolean many, IMostFileSystemAccess fsa) {
@@ -52,14 +50,14 @@ class Relations {
5250
«IF hasDetailAction»
5351
{% apply spaceless %}
5452
{% if not noLink %}
55-
<a href="{{ path('«route('detail')»'«routeParams('item', true)») }}" title="{{ item|«app.appName.formatForDB»_formattedTitle|e('html_attr') }}">
53+
<a href="{{ path('«route('detail')»', item.getRouteParameters()) }}" title="{{ item|«app.appName.formatForDB»_formattedTitle|e('html_attr') }}">
5654
{% endif %}
5755
«ENDIF»
5856
{{ item|«app.appName.formatForDB»_formattedTitle }}
5957
«IF hasDetailAction»
6058
{% if not noLink %}
6159
</a>
62-
<a id="«name.formatForCode»Item{{ item.getKey() }}Display" href="{{ path('«route('detail')»', {«IF hasSluggableFields»«appendSlug('item', true)»«ELSE»«routePkParams('item', true)»«ENDIF», raw: 1}) }}" title="{% trans %}Open quick view window{% endtrans %}" class="«app.vendorAndName.toLowerCase»-inline-window d-none" data-modal-title="{{ item|«app.appName.formatForDB»_formattedTitle|e('html_attr') }}"><i class="fas fa-id-card"></i></a>
60+
<a id="«name.formatForCode»Item{{ item.getKey() }}Display" href="{{ path('«route('detail')»', item.getRouteParameters({raw: 1})) }}" title="{% trans %}Open quick view window{% endtrans %}" class="«app.vendorAndName.toLowerCase»-inline-window d-none" data-modal-title="{{ item|«app.appName.formatForDB»_formattedTitle|e('html_attr') }}"><i class="fas fa-id-card"></i></a>
6361
{% endif %}
6462
{% endapply %}
6563
«ENDIF»

0 commit comments

Comments
 (0)