Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit c5328ed

Browse files
ElectricMaxxxdbu
ElectricMaxxx
authored and
dbu
committed
Allign form tab group (#99)
* move form group/tab configuration of seo admin under extensions * add configuration for form group/tab of route referrers extension * move form group/tab parameters of core extensions on common position
1 parent 424a063 commit c5328ed

24 files changed

+89
-47
lines changed

‎src/Admin/Routing/Extension/RouteReferrersExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class RouteReferrersExtension extends AbstractAdminExtension
2626
private $formGroup;
2727
private $formTab;
2828

29-
public function __construct($formGroup = 'form.group_routes', $formTab = 'form.tab_routing')
29+
public function __construct($formGroup = 'form.group_routing', $formTab = 'form.tab_routing')
3030
{
3131
$this->formGroup = $formGroup;
3232
$this->formTab = $formTab;
@@ -40,7 +40,7 @@ public function configureFormFields(FormMapper $formMapper)
4040

4141
$formMapper
4242
->tab($this->formTab)
43-
->with('form.group_routes', ['translation_domain' => 'CmfSonataPhpcrAdminIntegrationBundle'])
43+
->with($this->formGroup, ['translation_domain' => 'CmfSonataPhpcrAdminIntegrationBundle'])
4444
->add(
4545
'routes',
4646
CollectionType::class,

‎src/DependencyInjection/Factory/CoreAdminFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
6363
$loader->load('core.xml');
6464

6565
foreach ($config['extensions'] as $extension => $values) {
66-
$container->setParameter('cmf_sonata_phpcr_admin_integration.core.'.$extension.'.form_group', $values['form_group']);
67-
$container->setParameter('cmf_sonata_phpcr_admin_integration.core.'.$extension.'.form_tab', $values['form_tab']);
66+
$container->setParameter('cmf_sonata_phpcr_admin_integration.core.extension.'.$extension.'.form_group', $values['form_group']);
67+
$container->setParameter('cmf_sonata_phpcr_admin_integration.core.extension.'.$extension.'.form_tab', $values['form_tab']);
6868
}
6969
}
7070
}

‎src/DependencyInjection/Factory/MenuAdminFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\DependencyInjection\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
15+
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1718

‎src/DependencyInjection/Factory/RoutingAdminFactory.php

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,21 @@ public function getKey()
3434
*/
3535
public function addConfiguration(NodeBuilder $builder)
3636
{
37-
$builder->scalarNode('basepath')->defaultNull()->end();
38-
$builder->scalarNode('content_basepath')->defaultNull()->end();
37+
$builder
38+
->arrayNode('extensions')
39+
->addDefaultsIfNotSet()
40+
->children()
41+
->arrayNode('referrers')
42+
->addDefaultsIfNotSet()
43+
->children()
44+
->scalarNode('form_group')->defaultValue('form.group_routing')->end()
45+
->scalarNode('form_tab')->defaultValue('form.tab_routing')->end()
46+
->end()
47+
->end()
48+
->end()
49+
->end()
50+
->scalarNode('basepath')->defaultNull()->end()
51+
->scalarNode('content_basepath')->defaultNull()->end();
3952
}
4053

4154
/**
@@ -47,6 +60,14 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
4760

4861
$container->setParameter('cmf_sonata_phpcr_admin_integration.routing.basepath', $config['basepath']);
4962
$container->setParameter('cmf_sonata_phpcr_admin_integration.routing.content_basepath', $config['content_basepath']);
63+
$container->setParameter(
64+
'cmf_sonata_phpcr_admin_integration.routing.extension.referrers.from_group',
65+
$config['extensions']['referrers']['form_group']
66+
);
67+
$container->setParameter(
68+
'cmf_sonata_phpcr_admin_integration.routing.extension.referrers.from_tab',
69+
$config['extensions']['referrers']['form_tab']
70+
);
5071
}
5172

5273
/**

‎src/DependencyInjection/Factory/SeoAdminFactory.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,18 @@ public function getKey()
3434
public function addConfiguration(NodeBuilder $builder)
3535
{
3636
$builder
37-
->scalarNode('form_group')->defaultValue('form.group_seo')->end()
38-
->scalarNode('form_tab')->defaultValue('form.tab_seo')->end()
37+
->arrayNode('extensions')
38+
->addDefaultsIfNotSet()
39+
->children()
40+
->arrayNode('metadata')
41+
->addDefaultsIfNotSet()
42+
->children()
43+
->scalarNode('form_group')->defaultValue('form.group_seo')->end()
44+
->scalarNode('form_tab')->defaultValue('form.tab_seo')->end()
45+
->end()
46+
->end()
47+
->end()
48+
->end()
3949
;
4050
}
4151

@@ -45,7 +55,7 @@ public function addConfiguration(NodeBuilder $builder)
4555
public function create(array $config, ContainerBuilder $container, XmlFileLoader $loader)
4656
{
4757
$loader->load('seo.xml');
48-
$container->setParameter('cmf_sonata_phpcr_admin_integration.seo.form_group', $config['form_group']);
49-
$container->setParameter('cmf_sonata_phpcr_admin_integration.seo.form_tab', $config['form_tab']);
58+
$container->setParameter('cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_group', $config['extensions']['metadata']['form_group']);
59+
$container->setParameter('cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_tab', $config['extensions']['metadata']['form_tab']);
5060
}
5161
}

‎src/Resources/config/core.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
id="cmf_sonata_phpcr_admin_integration.core.extension.publish_workflow.publishable"
1818
class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Core\Extension\PublishableExtension"
1919
public="false">
20-
<argument>%cmf_sonata_phpcr_admin_integration.core.publishable.form_group%</argument>
21-
<argument>%cmf_sonata_phpcr_admin_integration.core.publishable.form_tab%</argument>
20+
<argument>%cmf_sonata_phpcr_admin_integration.core.extension.publishable.form_group%</argument>
21+
<argument>%cmf_sonata_phpcr_admin_integration.core.extension.publishable.form_tab%</argument>
2222
<tag name="sonata.admin.extension"/>
2323
</service>
2424

2525
<service
2626
id="cmf_sonata_phpcr_admin_integration.core.extension.publish_workflow.time_period"
2727
class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Core\Extension\PublishTimePeriodExtension"
2828
public="false">
29-
<argument>%cmf_sonata_phpcr_admin_integration.core.publish_time.form_group%</argument>
30-
<argument>%cmf_sonata_phpcr_admin_integration.core.publish_time.form_tab%</argument>
29+
<argument>%cmf_sonata_phpcr_admin_integration.core.extension.publish_time.form_group%</argument>
30+
<argument>%cmf_sonata_phpcr_admin_integration.core.extension.publish_time.form_tab%</argument>
3131
<tag name="sonata.admin.extension"/>
3232
</service>
3333

‎src/Resources/config/routing.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
<service
6161
id="cmf_sonata_phpcr_admin_integration.routing.extension.route_referrers"
6262
class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Routing\Extension\RouteReferrersExtension">
63+
<argument>%cmf_sonata_phpcr_admin_integration.routing.extension.referrers.from_group%</argument>
64+
<argument>%cmf_sonata_phpcr_admin_integration.routing.extension.referrers.from_tab%</argument>
6365
<tag name="sonata.admin.extension"/>
6466
</service>
6567

‎src/Resources/config/seo.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<service
99
id="cmf_sonata_phpcr_admin_integration.seo.extension.metadata"
1010
class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Seo\Extension\SeoContentAdminExtension">
11-
<argument>%cmf_sonata_phpcr_admin_integration.seo.form_group%</argument>
12-
<argument>%cmf_sonata_phpcr_admin_integration.seo.form_tab%</argument>
11+
<argument>%cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_group%</argument>
12+
<argument>%cmf_sonata_phpcr_admin_integration.seo.extension.metadata.form_tab%</argument>
1313
<tag name="sonata.admin.extension" />
1414
</service>
1515
</services>

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.cs.xliff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@
491491
<!-- TODO: Translate -->
492492
<target>Default values</target>
493493
</trans-unit>
494-
<trans-unit id="form.group_routes">
495-
<source>form.group_routes</source>
494+
<trans-unit id="form.group_routing">
495+
<source>form.group_routing</source>
496496
<!-- TODO: Translate -->
497497
<target>Routes</target>
498498
</trans-unit>

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.de.xliff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,8 +490,8 @@
490490
<source>form.group_defaults</source>
491491
<target>Vorgabewerte</target>
492492
</trans-unit>
493-
<trans-unit id="form.group_routes">
494-
<source>form.group_routes</source>
493+
<trans-unit id="form.group_routing">
494+
<source>form.group_routing</source>
495495
<target>Routen</target>
496496
</trans-unit>
497497

0 commit comments

Comments
 (0)