Merge tag '2.1.2'

Hotfix version - Support for translated version - Correct travis - Correct Event Callbacke
MetaModels · Mar 7, 2021 · 27cfbe7 · 27cfbe7
2 parents 68d547f + 1a6541e
commit 27cfbe7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,15 +13,18 @@ php:
   - "7.1"
 
 env:
-  - CONTAO_VERSION=~4.8.0
+  - CONTAO_VERSION=~4.10.0
+  - CONTAO_VERSION=~4.9.0
   - CONTAO_VERSION=~4.4.0
 
 # Exclude impossible Contao Version combinations.
 matrix:
   exclude:
+    - php: "7.1"
+      env: CONTAO_VERSION=~4.10.0
   fast_finish: true
   allow_failures:
-    - env: CONTAO_VERSION=~4.8.0
+    - env: CONTAO_VERSION=~4.10.0
 
 before_script:
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

diff --git a/README.md b/README.md
diff --git a/src/EventListener/InitializeListener.php b/src/EventListener/InitializeListener.php
@@ -91,10 +91,15 @@ public function onKernelRequest(GetResponseEvent $event)
      */
     public function addBackendModules(&$localMenu)
     {
-        $strModule = Input::get('do');
-        $strTable  = Input::get('table');
+        $strModule      = Input::get('do');
+        $strTable       = Input::get('table');
+        $blnLangSupport = Input::get('langSupport');
 
-        if (substr($strModule, 0, 10) == 'metamodel_' && $strTable == 'tl_content') {
+        if (
+            substr($strModule, 0, 10) == 'metamodel_'
+            && $strTable == 'tl_content'
+            && $blnLangSupport === null
+        ) {
             $needsToBeAdded = true;
             foreach ($GLOBALS['BE_MOD'] as $key => $mod) {
                 if (isset($mod[$strModule])) {

diff --git a/src/Resources/config/listeners.yml b/src/Resources/config/listeners.yml
@@ -2,21 +2,18 @@ services:
   MetaModels\AttributeContentArticleBundle\EventListener\BackendEventListener:
     public: false
     tags:
-      -
-        name: kernel.event_listener
+      - name: kernel.event_listener
         event: 'dc-general.model.post-duplicate'
         method: 'handlePostDuplicationModel'
-      -
-        name: kernel.event_listener
+      - name: kernel.event_listener
         event: 'dc-general.model.post-paste'
         method: 'handlePostPasteModel'
   MetaModels\AttributeContentArticleBundle\EventListener\GetOptionsListener:
     public: false
     arguments:
       - '@metamodels.factory'
     tags:
-      -
-        name: kernel.event_listener
+      - name: kernel.event_listener
         event: 'men-at-work.multi-column-wizard.get-options'
         method: getOptions
   MetaModels\AttributeContentArticleBundle\EventListener\InitializeListener:
@@ -27,7 +24,6 @@ services:
       - "@contao.routing.scope_matcher"
       - "@metamodels.view_combination"
     tags:
-      -
-        name: kernel.event_listener
+      - name: kernel.event_listener
         event: kernel.request
-        priority: -6000
+        priority: -600
diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php
@@ -19,21 +19,27 @@
  * @filesource
  */
 
+use Contao\Input;
 use MetaModels\AttributeContentArticleBundle\Table\ArticleContent;
 
 $GLOBALS['TL_DCA']['tl_content']['fields']['mm_slot'] = [
     'sql' => "varchar(255) NOT NULL default ''",
 ];
 
-$strModule = \Input::get('do');
-$strTable  = \Input::get('table');
+$strModule      = Input::get('do');
+$strTable       = Input::get('table');
+$strLangSupport = Input::get('langSupport');
 
 // Change TL_Content for the article popup
-if (substr($strModule, 0, 10) == 'metamodel_' && $strTable == 'tl_content') {
+if (
+    \substr($strModule, 0, 10) == 'metamodel_'
+    && $strTable == 'tl_content'
+    && $strLangSupport === null
+) {
     $GLOBALS['TL_DCA']['tl_content']['config']['dataContainer']                         =
         'TableMetaModelsContentArticle';
     $GLOBALS['TL_DCA']['tl_content']['config']['ptable']                                =
-        \Input::get('ptable');
+        Input::get('ptable');
     $GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][]                   =
         [
             ArticleContent::class,
@@ -52,6 +58,6 @@
     $GLOBALS['TL_DCA']['tl_content']['list']['sorting']['filter'][]                     =
         [
             'mm_slot=?',
-            \Input::get('slot')
+            Input::get('slot')
         ];
 }
diff --git a/src/Widgets/ContentArticleWidget.php b/src/Widgets/ContentArticleWidget.php
@@ -27,7 +27,6 @@
 use Contao\Widget;
 use ContaoCommunityAlliance\DcGeneral\Contao\Compatibility\DcCompat;
 use Doctrine\DBAL\Connection;
-use Twig\Environment;
 
 /**
  * Class ContentArticleWidget

diff --git a/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php b/tests/DependencyInjection/MetaModelsAttributeContentArticleExtensionTest.php
@@ -51,6 +51,5 @@ public function testLoad(): void
         {
             self::assertTrue($container->hasDefinition($expectedDefinition));
         }
-
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,5 @@ public function testLoad(): void @@
             {
                 self::assertTrue($container->hasDefinition($expectedDefinition));
             }
         }
     }