Merge pull request #5 from contao-estatemanager/develop

Consider Google Maps Bundle before adjusting the palette
contao-estatemanager · Jul 23, 2020 · 747b0a7 · 747b0a7
2 parents e246bfd + 133dad6
commit 747b0a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -18,6 +18,7 @@
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
 use ContaoEstateManager\EstateManager\EstateManager;
 use ContaoEstateManager\Project\EstateManagerProject;
+use ContaoEstateManager\GoogleMaps\EstateManagerGoogleMaps;
 
 class Plugin implements BundlePluginInterface
 {
@@ -28,7 +29,7 @@ public function getBundles(ParserInterface $parser): array
     {
         return [
             BundleConfig::create(EstateManagerProject::class)
-                ->setLoadAfter([ContaoCoreBundle::class, EstateManager::class])
+                ->setLoadAfter([ContaoCoreBundle::class, EstateManager::class, EstateManagerGoogleMaps::class])
                 ->setReplace(['estatemanager-project']),
         ];
     }

diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php
@@ -15,12 +15,6 @@
     // Add module palette for projects
     $GLOBALS['TL_DCA']['tl_module']['palettes']['realEstateProjectList']  = '{title_legend},name,headline,type;{config_legend},numberOfItems,perPage,filterMode,childrenObserveFiltering,addSorting;{redirect_legend},jumpTo,jumpToProject;{item_extension_legend:hide},addProvider,addContactPerson;{template_legend:hide},statusTokens,customTpl,realEstateProjectTemplate,realEstateTemplate,realEstateProviderTemplate,realEstateContactPersonTemplate;{image_legend:hide},imgSize,projectImgSize,providerImgSize,contactPersonImgSize;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 
-    // Extend the googlemaps palettes
-    Contao\CoreBundle\DataContainer\PaletteManipulator::create()
-        ->addField(array('showProjects'), 'config_legend', Contao\CoreBundle\DataContainer\PaletteManipulator::POSITION_APPEND)
-        ->applyToPalette('realEstateGoogleMap', 'tl_module')
-    ;
-
     // Add field
     $GLOBALS['TL_DCA']['tl_module']['fields']['showProjects'] = array
     (
@@ -77,4 +71,14 @@
         },
         'sql'                     => "varchar(64) NOT NULL default ''"
     );
+
+    // Extend the googlemaps palettes
+    $bundles = Contao\System::getContainer()->getParameter('kernel.bundles');
+
+    if (isset($bundles['EstateManagerGoogleMaps']))
+    {
+        Contao\CoreBundle\DataContainer\PaletteManipulator::create()
+            ->addField(array('showProjects'), 'config_legend', Contao\CoreBundle\DataContainer\PaletteManipulator::POSITION_APPEND)
+            ->applyToPalette('realEstateGoogleMap', 'tl_module');
+    }
 }