Fix for 4.0.3

studioespresso · Feb 5, 2024 · e268177 · e268177
1 parent fa6ff2e
commit e268177
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.0.3 - 2024-02-05
+### Fixed
+- Fixed a permissions issue on sites with multiple users and user groups
+
+
 ## 4.0.2 - 2024-01-21
 ### Fixed
 - Fixed getting schema data for multi-site setups

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-seo-fields",
     "description": "Fields for your SEO & OG meta data",
     "type": "craft-plugin",
-    "version": "4.0.2",
+    "version": "4.0.3",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/controllers/DefaultsController.php b/src/controllers/DefaultsController.php
@@ -14,24 +14,23 @@ public function actionIndex()
         $params = Craft::$app->getRequest()->getQueryParams();
         unset($params['p']);
         $currentUser = Craft::$app->getUser()->getIdentity();
-        $primarySite = Craft::$app->sites->getPrimarySite();
+        $editableSite = Craft::$app->getSites()->getEditableSites();
         if ($currentUser->can('seo-fields:default')) {
-            $this->redirect(UrlHelper::cpUrl("seo-fields/defaults/$primarySite->handle", $params));
+            $this->redirect(UrlHelper::cpUrl("seo-fields/defaults/{$editableSite[0]->handle}", $params));
         } elseif ($currentUser->can('seo-fields:notfound')) {
-            $this->redirect(UrlHelper::cpUrl("seo-fields/not-found/$primarySite->handle", $params));
+            $this->redirect(UrlHelper::cpUrl("seo-fields/not-found/{$editableSite[0]->handle}", $params));
         } elseif ($currentUser->can('seo-fields:redirects')) {
-            $this->redirect(UrlHelper::cpUrl("seo-fields/redirects/$primarySite->handle", $params));
+            $this->redirect(UrlHelper::cpUrl("seo-fields/redirects/{$editableSite[0]->handle}", $params));
         } elseif ($currentUser->can('seo-fields:robots')) {
-            $this->redirect(UrlHelper::cpUrl("seo-fields/robots/$primarySite->handle", $params));
+            $this->redirect(UrlHelper::cpUrl("seo-fields/robots/{$editableSite[0]->handle}", $params));
         } elseif ($currentUser->can('seo-fields:sitemap')) {
-            $this->redirect(UrlHelper::cpUrl("seo-fields/sitemap/$primarySite->handle", $params));
+            $this->redirect(UrlHelper::cpUrl("seo-fields/sitemap/{$editableSite[0]->handle}", $params));
         }
     }
 
     public function actionSettings($siteHandle = null)
     {
         $site = Craft::$app->sites->getSiteByHandle($siteHandle);
-        Craft::$app->sites->setCurrentSite($site);
         $data = SeoFields::$plugin->defaultsService->getDataBySite($site);
         return $this->renderTemplate('seo-fields/_defaults', [
             'data' => $data,

diff --git a/src/templates/_defaults.twig b/src/templates/_defaults.twig
@@ -23,7 +23,8 @@
 {% block content %}
     {{ actionInput('seo-fields/defaults/save') }}
 
-    <input type="hidden" name="siteId" value="{{ currentSite.id }}">
+
+    <input type="hidden" name="siteId" value="{{ selectedSite.id }}">
 
     <style>
         .seo-introduction {