Merge f9df139 into 959a3d8

alterphp · Mar 31, 2018 · 6a4cd1d · 6a4cd1d
2 parents 959a3d8 + f9df139
commit 6a4cd1d
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 2 deletions.
diff --git a/...figuration/EmbeddedListSortConfigPass.php → ...figuration/EmbeddedListViewConfigPass.php b/...figuration/EmbeddedListSortConfigPass.php → ...figuration/EmbeddedListViewConfigPass.php
@@ -8,11 +8,35 @@
  * Initializes the configuration for all the views of each entity, which is
  * needed when some entity relies on the default configuration for some view.
  */
-class EmbeddedListSortConfigPass implements ConfigPassInterface
+class EmbeddedListViewConfigPass implements ConfigPassInterface
 {
+    private $defaultOpenInNewTabLink;
+
+    public function __construct($defaultOpenInNewTabLink)
+    {
+        $this->defaultOpenInNewTabLink = $defaultOpenInNewTabLink;
+    }
+
     public function process(array $backendConfig)
     {
         $backendConfig = $this->processSortingConfig($backendConfig);
+        $backendConfig = $this->processOpenInNewTabLinkConfig($backendConfig);
+
+        return $backendConfig;
+    }
+
+    /**
+     * @param array $backendConfig
+     *
+     * @return array
+     */
+    private function processOpenInNewTabLinkConfig(array $backendConfig)
+    {
+        foreach ($backendConfig['entities'] as $entityName => $entityConfig) {
+            if (!isset($entityConfig['embeddedList']['open_in_new_tab_link'])) {
+                $backendConfig['entities'][$entityName]['embeddedList']['open_in_new_tab_link'] = $this->defaultOpenInNewTabLink;
+            }
+        }
 
         return $backendConfig;
     }

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -36,6 +36,14 @@ public function getConfigTreeBuilder()
                 ->scalarNode('minimum_role')
                     ->defaultNull()
                 ->end()
+                ->arrayNode('embedded_list')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->booleanNode('open_in_new_tab_link')
+                            ->defaultTrue()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

diff --git a/src/DependencyInjection/EasyAdminExtensionExtension.php b/src/DependencyInjection/EasyAdminExtensionExtension.php
@@ -24,6 +24,10 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('easy_admin_extension.custom_form_types', $config['custom_form_types']);
         $container->setParameter('easy_admin_extension.minimum_role', $config['minimum_role']);
+        $container->setParameter(
+            'easy_admin_extension.embedded_list.open_in_new_tab_link',
+            $config['embedded_list']['open_in_new_tab_link']
+        );
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -12,7 +12,8 @@
             <!-- Makes it process just before PropertyConfigPass -->
             <tag name="easyadmin.config_pass" priority="41"/>
         </service>
-        <service id="alterphp.easyadmin_extension.config_pass.embedded_list_sort" class="AlterPHP\EasyAdminExtensionBundle\Configuration\EmbeddedListSortConfigPass">
+        <service id="alterphp.easyadmin_extension.config_pass.embedded_list_view" class="AlterPHP\EasyAdminExtensionBundle\Configuration\EmbeddedListViewConfigPass">
+            <argument>%easy_admin_extension.embedded_list.open_in_new_tab_link%</argument>
             <!-- Makes it process just after ViewConfigPass -->
             <tag name="easyadmin.config_pass" priority="29"/>
         </service>

diff --git a/src/Resources/views/default/embedded_list.html.twig b/src/Resources/views/default/embedded_list.html.twig
@@ -98,6 +98,7 @@
             {% endblock table_body %}
             </tbody>
 
+            {% if _entity_config.embeddedList.open_in_new_tab_link %}
             <tfoot>
               <tr>
                 <td colspan="{{ _columns_count }}" class="text-center">
@@ -110,6 +111,7 @@
                 </td>
               </tr>
             </tfoot>
+            {% endif %}
         </table>
     </div>