Merge branch 'hotfix/3.1.6'

terminal42 · Aug 1, 2017 · 63cba4b · 63cba4b
2 parents bdc3246 + a43ee59
commit 63cba4b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 41 deletions.
diff --git a/dca/tl_page.php b/dca/tl_page.php
@@ -26,7 +26,8 @@
     'inputType'               => 'pageTree',
     'eval'                    => array('fieldType'=>'radio', 'multiple'=>false, 'rootNodes'=>[0], 'tl_class'=>'w50 clr'),
     'sql'                     => "int(10) unsigned NOT NULL default '0'",
-    'save_callback'           => [['Terminal42\ChangeLanguage\EventListener\DataContainer\PageFieldsListener', 'onSaveLanguageMain']]
+    'load_callback'           => [['Terminal42\ChangeLanguage\EventListener\DataContainer\PageFieldsListener', 'onLoadLanguageMain']],
+    'save_callback'           => [['Terminal42\ChangeLanguage\EventListener\DataContainer\PageFieldsListener', 'onSaveLanguageMain']],
 );
 
 $GLOBALS['TL_DCA']['tl_page']['fields']['languageRoot'] = array

diff --git a/library/Terminal42/ChangeLanguage/EventListener/DataContainer/PageFieldsListener.php b/library/Terminal42/ChangeLanguage/EventListener/DataContainer/PageFieldsListener.php
@@ -11,11 +11,51 @@
 
 namespace Terminal42\ChangeLanguage\EventListener\DataContainer;
 
+use Contao\Database;
 use Contao\DataContainer;
+use Contao\Input;
 use Contao\PageModel;
+use Terminal42\ChangeLanguage\PageFinder;
 
 class PageFieldsListener
 {
+    /**
+     * Sets rootNodes when initializing the languageMain field.
+     *
+     * @param mixed         $value
+     * @param DataContainer $dc
+     *
+     * @return mixed
+     */
+    public function onLoadLanguageMain($value, DataContainer $dc)
+    {
+        if (!$dc->id || 'page' !== Input::get('do')) {
+            return $value;
+        }
+
+        $page = PageModel::findWithDetails($dc->id);
+        $root = PageModel::findByPk($page->rootId);
+
+        if ($root->fallback
+            && (!$root->languageRoot || ($languageRoot = PageModel::findByPk($root->languageRoot)) === null)
+        ) {
+            return $value;
+        }
+
+        $pageFinder = new PageFinder();
+        $masterRoot = $pageFinder->findMasterRootForPage($page);
+
+        if (null !== $masterRoot) {
+            $GLOBALS['TL_DCA']['tl_page']['fields']['languageMain']['eval']['rootNodes'] = Database::getInstance()
+                ->prepare('SELECT id FROM tl_page WHERE pid=? ORDER BY sorting')
+                ->execute($masterRoot->id)
+                ->fetchEach('id')
+            ;
+        }
+
+        return $value;
+    }
+
     /**
      * Validate input value when saving tl_page.languageMain field.
      *

diff --git a/library/Terminal42/ChangeLanguage/EventListener/DataContainer/PageInitializationListener.php b/library/Terminal42/ChangeLanguage/EventListener/DataContainer/PageInitializationListener.php
@@ -11,11 +11,9 @@
 
 namespace Terminal42\ChangeLanguage\EventListener\DataContainer;
 
-use Contao\Database;
 use Contao\DataContainer;
 use Contao\PageModel;
 use Haste\Dca\PaletteManipulator;
-use Terminal42\ChangeLanguage\PageFinder;
 
 class PageInitializationListener
 {
@@ -47,12 +45,6 @@ public function onLoad(DataContainer $dc)
             case 'editAll':
                 $this->handleEditAllMode();
                 break;
-            // Page picker popup
-            case 'show':
-                if ('languageMain' === \Input::get('field')) {
-                    $this->setRootNodesForPage($dc->id);
-                }
-                break;
         }
     }
 
@@ -88,39 +80,11 @@ private function handleEditAllMode()
         $this->addRegularLanguageFields(
             array_diff(
                 array_keys($GLOBALS['TL_DCA']['tl_page']['palettes']),
-                ['__selector__', 'root']
+                ['__selector__', 'root', 'folder']
             )
         );
     }
 
-    /**
-     * Limits the available pages in page picker to the fallback page tree.
-     *
-     * @param int $pageId
-     */
-    private function setRootNodesForPage($pageId)
-    {
-        $page = PageModel::findWithDetails($pageId);
-        $root = PageModel::findByPk($page->rootId);
-
-        if ($root->fallback
-            && (!$root->languageRoot || ($languageRoot = PageModel::findByPk($root->languageRoot)) === null)
-        ) {
-            return;
-        }
-
-        $pageFinder = new PageFinder();
-        $masterRoot = $pageFinder->findMasterRootForPage($page);
-
-        if (null !== $masterRoot) {
-            $GLOBALS['TL_DCA']['tl_page']['fields']['languageMain']['eval']['rootNodes'] = Database::getInstance()
-                ->prepare('SELECT id FROM tl_page WHERE pid=? ORDER BY sorting')
-                ->execute($masterRoot->id)
-                ->fetchEach('id')
-            ;
-        }
-    }
-
     private function addRootLanguageFields()
     {
         PaletteManipulator::create()

diff --git a/library/Terminal42/ChangeLanguage/Navigation/NavigationItem.php b/library/Terminal42/ChangeLanguage/Navigation/NavigationItem.php
@@ -60,7 +60,7 @@ public function __construct(PageModel $rootPage, $label = null)
             );
         }
 
-        $this->rootPage = $rootPage;
+        $this->rootPage = $rootPage->loadDetails();
         $this->linkLabel = $label;
 
         if (null === $label) {
@@ -136,7 +136,7 @@ public function getTargetPage()
      */
     public function setTargetPage(PageModel $targetPage, $isDirectFallback, $isCurrentPage = false)
     {
-        $this->targetPage = $targetPage;
+        $this->targetPage = $targetPage->loadDetails();
         $this->isDirectFallback = (bool) $isDirectFallback;
         $this->isCurrentPage = (bool) $isCurrentPage;
     }
@@ -221,7 +221,7 @@ public function getHref(UrlParameterBag $urlParameterBag)
         $href = \Controller::generateFrontendUrl(
             $targetPage->row(),
             $urlParameterBag->generateParameters(),
-            $targetPage->language,
+            $targetPage->rootLanguage,
             true
         );