Merge remote-tracking branch 'origin/5'

_config/routing.yml

@@ -13,3 +13,4 @@ SilverStripe\Core\Injector\Injector:
       Middlewares:
         InitStateMiddleware: '%$TractorCow\Fluent\Middleware\InitStateMiddleware'
         DetectLocaleMiddleware: '%$TractorCow\Fluent\Middleware\DetectLocaleMiddleware'
+        LocaleSwitchRedirector: '%$TractorCow\Fluent\Middleware\LocaleSwitchRedirector'

readme.md

@@ -58,7 +58,6 @@ localisations, or being a part of the contributing team, please see
  * [Localised copy](docs/en/localised-copy.md)
  * [Versioned history](docs/en/versioned-history.md)
  * [Migrating from Translatable](docs/en/migrating-from-translatable.md)
- * [Changelogs](CHANGELOG.md)
 
 ## Translations
 

src/Middleware/LocaleSwitchRedirector.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace TractorCow\Fluent\Middleware;
+
+use SilverStripe\Admin\AdminRootController;
+use SilverStripe\Control\Controller;
+use SilverStripe\Control\Director;
+use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Control\HTTPResponse;
+use SilverStripe\Control\HTTPResponse_Exception;
+use SilverStripe\Control\Middleware\HTTPMiddleware;
+use TractorCow\Fluent\Extension\FluentDirectorExtension;
+use TractorCow\Fluent\State\FluentState;
+
+/**
+ * This middleware will safely redirect you to the cms landing page when switching locales,
+ * in case you were viewing a url that does not apply to the new locale.
+ */
+class LocaleSwitchRedirector implements HTTPMiddleware
+{
+    public function process(HTTPRequest $request, callable $delegate)
+    {
+        // Get and capture any possible errors
+        try {
+            $response = $delegate($request);
+        } catch (HTTPResponse_Exception $ex) {
+            $response = $ex->getResponse();
+        }
+
+        // Check if this is a 404 error attempting when switching locales in the CMS
+        $state = FluentState::singleton();
+        if ($response->getStatusCode() === 404
+            && !$state->getIsFrontend()
+            && $this->getParamLocale($request)
+        ) {
+            // Redirect to the CMS home page if the requested page doesn't exist
+            $response = new HTTPResponse();
+            $response->redirect(Controller::join_links(
+                Director::baseURL(),
+                AdminRootController::admin_url()
+            ));
+        }
+
+        return $response;
+    }
+
+    /**
+     * Get locale from the query_param
+     *
+     * @param HTTPRequest $request
+     * @return mixed
+     */
+    protected function getParamLocale(HTTPRequest $request)
+    {
+        $queryParam = FluentDirectorExtension::config()->get('query_param');
+        return (string)($request->param($queryParam) ?: $request->requestVar($queryParam));
+    }
+}

src/Model/Locale.php

@@ -21,10 +21,13 @@
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\ManyManyList;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\Permission;
 use SilverStripe\Security\PermissionProvider;
 use Symbiote\GridFieldExtensions\GridFieldAddNewInlineButton;
 use Symbiote\GridFieldExtensions\GridFieldEditableColumns;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
+use TractorCow\Fluent\Control\LocaleAdmin;
 use TractorCow\Fluent\Extension\FluentDirectorExtension;
 use TractorCow\Fluent\Extension\Traits\FluentObjectTrait;
 use TractorCow\Fluent\State\FluentState;
@@ -626,4 +629,65 @@ public function providePermissions()
         }
         return $permissions;
     }
+
+
+    /**
+     * @param Member $member
+     * @return boolean
+     */
+    public function canView($member = null)
+    {
+        $extended = $this->extendedCan(__FUNCTION__, $member);
+        if ($extended !== null) {
+            return $extended;
+        }
+        return Permission::check('CMS_ACCESS', 'any', $member);
+    }
+
+    /**
+     * @param Member $member
+     * @return boolean
+     */
+    public function canEdit($member = null)
+    {
+        $extended = $this->extendedCan(__FUNCTION__, $member);
+        if ($extended !== null) {
+            return $extended;
+        }
+
+        // Access locale admin permission
+        return LocaleAdmin::singleton()->canView($member);
+    }
+
+    /**
+     * @param Member $member
+     * @return boolean
+     */
+    public function canDelete($member = null)
+    {
+        $extended = $this->extendedCan(__FUNCTION__, $member);
+        if ($extended !== null) {
+            return $extended;
+        }
+
+        // Access locale admin permission
+        return LocaleAdmin::singleton()->canView($member);
+    }
+
+    /**
+     * @param Member $member
+     * @param array $context Additional context-specific data which might
+     * affect whether (or where) this object could be created.
+     * @return boolean
+     */
+    public function canCreate($member = null, $context = [])
+    {
+        $extended = $this->extendedCan(__FUNCTION__, $member, $context);
+        if ($extended !== null) {
+            return $extended;
+        }
+
+        // Access locale admin permission
+        return LocaleAdmin::singleton()->canView($member);
+    }
 }