Merge pull request #5 from punktDe/AddPageTranslationsSupport

[TASK] Add support for translated pages, update version

Author: Jashi

Classes/Backend/PageLayoutHeader.php

@@ -26,7 +26,7 @@ class PageLayoutHeader
     protected $backendUser;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $pageUid;
 
@@ -35,13 +35,41 @@ class PageLayoutHeader
      */
     protected $pageRecord;
 
+    /**
+     * @var int
+     */
+    protected $language;
+
 
 
     public function __construct()
     {
         $this->backendUser = $GLOBALS['BE_USER'];
         $this->pageUid = (int)GeneralUtility::_GET('id');
         $this->pageRecord = BackendUtility::getRecord('pages', $this->pageUid);
+        $this->language = (int)BackendUtility::getModuleData(['language'], [], 'web_layout')['language'];
+
+        $this->updatePageRecordIfOverlay();
+    }
+
+
+
+    /**
+     *
+     */
+    protected function updatePageRecordIfOverlay(): void
+    {
+        if ($this->language > 0) {
+            $overlayRecords = BackendUtility::getRecordLocalization(
+                'pages',
+                $this->pageUid,
+                $this->language
+            );
+
+            if (is_array($overlayRecords) && array_key_exists(0, $overlayRecords) && is_array($overlayRecords[0])) {
+                $this->pageRecord = $overlayRecords[0];
+            }
+        }
     }
 
 
@@ -60,7 +88,7 @@ public function render(): string
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Quickedit/Quickedit');
 
         $standaloneView = $this->initializeStandaloneView();
-        $standaloneView->assign('pageId', $this->pageUid);
+        $standaloneView->assign('pageId', $this->pageRecord['uid']);
         $standaloneView->assign('config', $this->getFieldConfigForPage());
         $standaloneView->assign('isVisible', $this->isVisible());
 
@@ -198,7 +226,8 @@ protected function prepareFieldsList(string $fields): string
             $fieldsArray = array_map('trim', $fieldsArray);
 
             foreach ($fieldsArray as $index => $field) {
-                if ($this->userHasAccessToField($field) === false) {
+                if ($this->userHasAccessToField($field) === false
+                    || $this->fieldIsAvailableForLanguage($field) === false) {
                     unset($fieldsArray[$index]);
                 }
             }
@@ -222,6 +251,24 @@ protected function userHasAccessToField(string $field): bool
 
 
 
+    /**
+     * @param string $field
+     * @return bool
+     */
+    protected function fieldIsAvailableForLanguage(string $field): bool
+    {
+        if ($this->language > 0) {
+            return $field !== '' && (
+                    !array_key_exists('l10n_mode', $GLOBALS['TCA']['pages']['columns'][$field]) ||
+                    $GLOBALS['TCA']['pages']['columns'][$field]['l10n_mode'] !== 'exclude'
+                );
+        }
+
+        return true;
+    }
+
+
+
     /**
      * Checks set previewFields and get the corresponding field labels and values for display in backend.
      *
@@ -284,8 +331,8 @@ protected function isVisible(): bool
 
         if (array_key_exists('quickedit', $this->backendUser->uc) &&
             array_key_exists('visible', $this->backendUser->uc['quickedit']) &&
-            array_key_exists($this->pageUid, $this->backendUser->uc['quickedit']['visible'])) {
-            $isVisible = (bool)$this->backendUser->uc['quickedit']['visible'][$this->pageUid];
+            array_key_exists($this->pageRecord['uid'], $this->backendUser->uc['quickedit']['visible'])) {
+            $isVisible = (bool)$this->backendUser->uc['quickedit']['visible'][$this->pageRecord['uid']];
         }
 
         return $isVisible;

Documentation/Changelog/Index.rst

@@ -6,6 +6,12 @@
 Change log
 ==========
 
+Version 0.2.0
+-------------
+
+- Add extension key to composer.json file
+- Add support for using toolbar with page translations
+
 Version 0.1.1
 -------------
 

Documentation/Settings.cfg

@@ -25,7 +25,7 @@ project     = Quickedit
 # ...   (recommended) version, displayed next to title (desktop) and in <meta name="book-version"
 # .................................................................................
 
-release     = 0.1.1
+release     = 0.2.0
 
 # .................................................................................
 # ...  (recommended) displayed in footer

ext_emconf.php

@@ -2,7 +2,7 @@
 $EM_CONF[$_EXTKEY] = [
     'title'            => 'Toolbar for editing page properties',
     'description'      => 'This extension provides a configurable toolbar for editing page properties.',
-    'version'          => '0.1.1',
+    'version'          => '0.2.0',
     'category'         => 'be',
     'constraints'      => [
         'depends'   => [