Merge branch 'release/3.3.2'

.gitignore

@@ -32,3 +32,4 @@ config.codekit3
 prepros-6.config
 /docs/.vuepress/dist
 /docs/.vitepress/dist
+/docs/.vitepress/cache

CHANGELOG.md

@@ -4,6 +4,10 @@ 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/).
 
+## 3.3.2 - 2023-09-13
+### Fixed
+- Fixed an issue where sitemaps couldn't be saved for different sites
+
 ## 3.3.1 - 2023-08-08
 ### Fixed
 - Permissions for defaults are now really fixed ([#77](https://github.com/studioespresso/craft-seo-fields/issues/77))

composer.json

@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-seo-fields",
     "description": "Fields for your SEO & OG meta data",
     "type": "craft-plugin",
-    "version": "3.3.1",
+    "version": "3.3.2",
     "keywords": [
         "craft",
         "cms",
@@ -18,7 +18,7 @@
     "authors": [
         {
             "name": "Studio Espresso",
-            "homepage": "https://www.studioespresso.dev"
+            "homepage": "https://www.studioespresso.co"
         },
         {
             "name": "Jan Henckens",

docs/sitemap.md

@@ -15,6 +15,6 @@ Support for custom urls and for registeren custom urls in code will be added in
 
 ### Multisite
 
-By default, each site in your Craft install will get the same sitemap.xml, depending on wether the sections you've enabled in the sitemap are enabled for that site and when the section has entries that are enabled for that site. If you need the option to change enable/disable section in the sitemap per site, you can add "sitemapPerSite" => true to config/seo-fields.php.
+By default, each site in your Craft install will get the same sitemap.xml, depending on wether the sections you've enabled in the sitemap are enabled for that site and when the section has entries that are enabled for that site. If you need the option to change enable/disable section in the sitemap per site, you can add `sitemapPerSite => true` to config/seo-fields.php.
 
-With that set, refresh the robots settings page and you'll see a sites dropdown at the top so you can switch sites and save a sitemap for each.
+With that set, refresh the Sitemap settings page and you'll see a sites dropdown at the top so you can switch sites and save a sitemap for each.

src/controllers/DefaultsController.php

@@ -34,11 +34,12 @@ public function actionIndex()
 
     public function actionSettings($siteHandle = null)
     {
-        $currentSite = Craft::$app->sites->getSiteByHandle($siteHandle);
-        Craft::$app->sites->setCurrentSite($currentSite);
-        $data = SeoFields::$plugin->defaultsService->getDataBySite($currentSite);
+        $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
+            'data' => $data,
+            'selectedSite' => $site
         ]);
 
     }

src/controllers/SitemapController.php

@@ -4,6 +4,7 @@
 
 use Craft;
 use craft\helpers\Template;
+use craft\records\Section_SiteSettings;
 use craft\web\Controller;
 use studioespresso\seofields\models\SeoDefaultsModel;
 use studioespresso\seofields\records\DefaultsRecord;
@@ -23,10 +24,19 @@ public function actionIndex()
 
     public function actionSettings($siteHandle = null)
     {
+        $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
+        Craft::$app->getSites()->getSiteByHandle($site);
+        $sectionsForSite = Section_SiteSettings::findAll(['siteId' => $site->id]);
+        $sections = [];
+        foreach($sectionsForSite as $s) {
+            $sections[] = Craft::$app->getSections()->getSectionById($s->sectionId);
+        }
         $data = SeoFields::$plugin->defaultsService->getDataBySiteHandle($siteHandle);
         return $this->renderTemplate('seo-fields/_sitemap', [
             'data' => $data,
-            'sitemapPerSite' => SeoFields::$plugin->getSettings()->sitemapPerSite
+            'sitemapPerSite' => SeoFields::$plugin->getSettings()->sitemapPerSite,
+            'sections' => $sections,
+            'selectedSite' => $site
         ]);
     }
 
@@ -38,10 +48,11 @@ public function actionSave()
         } else {
             $model = new SeoDefaultsModel();
         }
+
         $data['sitemap'] = Craft::$app->getRequest()->getBodyParam('data');
         $data['siteId'] = Craft::$app->getRequest()->getBodyParam('siteId', Craft::$app->getSites()->getPrimarySite()->id);
         $model->setAttributes($data);
-        SeoFields::$plugin->defaultsService->saveDefaults($model, Craft::$app->sites->currentSite->id);
+        SeoFields::$plugin->defaultsService->saveDefaults($model, $data['siteId']);
         SeoFields::$plugin->sitemapSerivce->clearCaches();
     }
 

src/services/DefaultsService.php

@@ -26,11 +26,12 @@ public function saveDefaults(SeoDefaultsModel $model, $siteId)
         $record = DefaultsRecord::findOne(
             ['siteId' => $siteId]
         );
+
         if (!$record) {
             $record = new DefaultsRecord();
         }
         $record->setAttribute('defaultMeta', $model->toArray(['defaultSiteTitle', 'defaultMetaDescription', 'titleSeperator', 'defaultImage']));
-        $record->setAttribute('siteId', $model->siteId);
+        $record->setAttribute('siteId', $model->siteId ?? $siteId);
         $record->setAttribute('enableRobots', $model->enableRobots);
         $record->setAttribute('robots', $model->robots);
         $record->setAttribute('sitemap', $model->sitemap);

src/templates/_includes/_sitemapSections.twig

@@ -11,9 +11,8 @@
         <tr>
             <th>{{ 'Section'|t('seo-fields') }}</th>
             <th>{{ 'Update frequency'|t('seo-fields') }}
-                <span class="info">
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-                    </span>
+{#                <span class="info">#}
+{#                    </span>#}
             </th>
             <th>Priority
                 <span class="info">
@@ -26,7 +25,7 @@
         <tbody>
 
         {% set sitemapSettings = data.sitemap|json_decode %}
-        {% for section in allSections %}
+        {% for section in sections %}
             {% set settings = attribute(sitemapSettings.entry, section.id) ?? [] %}
             <tr>
                 <th>{{ section.name }}</th>

src/templates/_includes/_sites.twig

@@ -1,16 +1,16 @@
 {% if craft.app.sites.getEditableSites()|length > 1 %}
-    <div id="revision-btn" class="btn menubtn" data-icon="world">{{ currentSite.name }}</div>
+    <div id="revision-btn" class="btn menubtn" data-icon="world">{{ selectedSite.name }}</div>
     <div class="menu">
         <ul class="padded">
             {% for site in craft.app.sites.getAllSites() %}
                 <li>
                     <a href="{{ url('seo-fields/' ~ selectedSubnavItem ~ '/' ~ site.handle ) }}"
-                       {% if site.handle == currentSite.handle %}class="sel"{% endif %}>
+                       {% if site.handle == selectedSite.handle %}class="sel"{% endif %}>
                         {{ site.name }}
                     </a>
                 </li>
             {% endfor %}
         </ul>
     </div>
-    <input type="hidden" name="siteId" value="{{ currentSite.id }}">
+    <input type="hidden" name="siteId" value="{{ selectedSite.id }}">
 {% endif %}

src/templates/_sitemap.twig

@@ -33,7 +33,7 @@
 {% block content %}
     {{ actionInput('seo-fields/sitemap/save') }}
     {% if sitemapPerSite %}
-        <input type="hidden" name="siteId" value="{{ currentSite.id }}">
+        <input type="hidden" name="siteId" value="{{ selectedSite.id }}">
     {% endif %}
 
     {% if data.id is defined %}