From d42637098a790617db459560e2230e56269b5ab8 Mon Sep 17 00:00:00 2001 From: Mojmir Fendek Date: Fri, 5 Apr 2024 11:43:40 +1300 Subject: [PATCH 1/2] ENH: Localisation manager links available for CMS edit link capable models. --- src/Extension/FluentSiteTreeExtension.php | 58 ---------------------- src/Extension/Traits/FluentObjectTrait.php | 38 +++++++++++++- 2 files changed, 37 insertions(+), 59 deletions(-) diff --git a/src/Extension/FluentSiteTreeExtension.php b/src/Extension/FluentSiteTreeExtension.php index 0eedf5dc..2796d92d 100644 --- a/src/Extension/FluentSiteTreeExtension.php +++ b/src/Extension/FluentSiteTreeExtension.php @@ -8,12 +8,10 @@ use SilverStripe\Control\Controller; use SilverStripe\Control\Director; use SilverStripe\Control\HTTPResponse; -use SilverStripe\Core\Convert; use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; use SilverStripe\Forms\LiteralField; -use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBHTMLText; use TractorCow\Fluent\Extension\Traits\FluentAdminTrait; use TractorCow\Fluent\Model\Locale; @@ -528,60 +526,4 @@ public function actionComplete($form, $message) { return null; } - - /** - * Augment Localisation tab with clickable locale links to allow easy navigation between page localisations - * - * @param $summaryColumns - * @see FluentExtension::updateFluentCMSFields() - */ - public function updateLocalisationTabColumns(&$summaryColumns) - { - parent::updateLocalisationTabColumns($summaryColumns); - - if (!array_key_exists('Title', $summaryColumns)) { - return; - } - - $controller = Controller::curr(); - - if (!$controller) { - return; - } - - $request = $controller->getRequest(); - - if (!$request) { - return; - } - - // This is to get URL only, getVars are not part of the URL - $url = $this->owner->CMSEditLink(); - - if (!$url) { - return; - } - - // Pass getVars separately so we can process them later - $params = $request->getVars(); - $url = Director::makeRelative($url); - - $summaryColumns['Title'] = [ - 'title' => 'Title', - 'callback' => function (Locale $object) use ($url, $params) { - if (!$object->RecordLocale()) { - return null; - } - - $recordLocale = $object->RecordLocale(); - $locale = $recordLocale->getLocale(); - $params['l'] = $locale; - $localeLink = Controller::join_links($url, '?' . http_build_query($params)); - $localeTitle = Convert::raw2xml($recordLocale->getTitle()); - $render = sprintf('%s', $localeLink, $localeTitle); - - return DBField::create_field('HTMLVarchar', $render); - } - ]; - } } diff --git a/src/Extension/Traits/FluentObjectTrait.php b/src/Extension/Traits/FluentObjectTrait.php index 54076df5..fc07196b 100644 --- a/src/Extension/Traits/FluentObjectTrait.php +++ b/src/Extension/Traits/FluentObjectTrait.php @@ -2,6 +2,10 @@ namespace TractorCow\Fluent\Extension\Traits; +use SilverStripe\Admin\CMSEditLinkExtension; +use SilverStripe\Control\Controller; +use SilverStripe\Control\Director; +use SilverStripe\Core\Convert; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridFieldConfig; @@ -10,6 +14,7 @@ use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataQuery; +use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\Queries\SQLSelect; use TractorCow\Fluent\Model\Locale; use TractorCow\Fluent\State\FluentState; @@ -88,7 +93,7 @@ public function augmentDataQueryCreation( */ protected function updateFluentCMSFields(FieldList $fields) { - /** @var DataObject $owner */ + /** @var DataObject|CMSEditLinkExtension $owner */ $owner = $this->owner; if (!$owner->ID) { return; @@ -108,6 +113,37 @@ protected function updateFluentCMSFields(FieldList $fields) 'Locale' => 'Locale' ]; + // Augment Localisation tab with clickable locale links to allow easy navigation between model localisations + if ($owner->hasExtension(CMSEditLinkExtension::class)) { + $controller = Controller::has_curr() ? Controller::curr() : null; + $request = $controller?->getRequest(); + + // Pass getVars separately so we can process them later + $params = $request?->getVars() ?? []; + + // This is to get URL only, getVars are not part of the URL + $url = $owner->CMSEditLink(); + $url = Director::makeRelative($url); + + $summaryColumns['Title'] = [ + 'title' => 'Title', + 'callback' => function (Locale $object) use ($url, $params): ?DBField { + if (!$object->RecordLocale()) { + return null; + } + + $recordLocale = $object->RecordLocale(); + $locale = $recordLocale->getLocale(); + $params['l'] = $locale; + $localeLink = Controller::join_links($url, '?' . http_build_query($params)); + $localeTitle = Convert::raw2xml($recordLocale->getTitle()); + $render = sprintf('%s', $localeLink, $localeTitle); + + return DBField::create_field('HTMLVarchar', $render); + } + ]; + } + // Let extensions override columns $owner->extend('updateLocalisationTabColumns', $summaryColumns); $columns->setDisplayFields($summaryColumns); From 07f282123297068d40e7ce764a280e295a6f76a1 Mon Sep 17 00:00:00 2001 From: Mojmir Fendek Date: Mon, 8 Apr 2024 16:35:43 +1200 Subject: [PATCH 2/2] PR feedback. --- src/Extension/Traits/FluentObjectTrait.php | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Extension/Traits/FluentObjectTrait.php b/src/Extension/Traits/FluentObjectTrait.php index fc07196b..6206160c 100644 --- a/src/Extension/Traits/FluentObjectTrait.php +++ b/src/Extension/Traits/FluentObjectTrait.php @@ -125,23 +125,25 @@ protected function updateFluentCMSFields(FieldList $fields) $url = $owner->CMSEditLink(); $url = Director::makeRelative($url); - $summaryColumns['Title'] = [ - 'title' => 'Title', - 'callback' => function (Locale $object) use ($url, $params): ?DBField { - if (!$object->RecordLocale()) { - return null; + if ($url) { + $summaryColumns['Title'] = [ + 'title' => 'Title', + 'callback' => function (Locale $object) use ($url, $params): ?DBField { + if (!$object->RecordLocale()) { + return null; + } + + $recordLocale = $object->RecordLocale(); + $locale = $recordLocale->getLocale(); + $params['l'] = $locale; + $localeLink = Controller::join_links($url, '?' . http_build_query($params)); + $localeTitle = Convert::raw2xml($recordLocale->getTitle()); + $render = sprintf('%s', $localeLink, $localeTitle); + + return DBField::create_field('HTMLVarchar', $render); } - - $recordLocale = $object->RecordLocale(); - $locale = $recordLocale->getLocale(); - $params['l'] = $locale; - $localeLink = Controller::join_links($url, '?' . http_build_query($params)); - $localeTitle = Convert::raw2xml($recordLocale->getTitle()); - $render = sprintf('%s', $localeLink, $localeTitle); - - return DBField::create_field('HTMLVarchar', $render); - } - ]; + ]; + } } // Let extensions override columns