Merge branch 'release/3.3.8'

studioespresso · Nov 23, 2023 · b4a6051 · b4a6051
2 parents ad731ed + 8f5d05b
commit b4a6051
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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.8 - 2023-11-23
+### Fixed
+- Redirects and 404's now works for users that only have access to 1 site. ([#87](https://github.com/studioespresso/craft-seo-fields/issues/87))
+
+
+
 ## 3.3.7 - 2023-11-19
 ### Fixed
 - Fixed an issue where page title wouldn't be used as fallback meta title ([#86](https://github.com/studioespresso/craft-seo-fields/issues/86))

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": "3.3.7",
+    "version": "3.3.8",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/templates/_notfound/_index.twig b/src/templates/_notfound/_index.twig
@@ -40,31 +40,6 @@
         </div>
         <input type="hidden" name="siteId" value="{{ currentSite.id }}">
     {% endif %}
-{#    <div id="handles-btn" class="btn menubtn"#}
-{#         data-icon="tool">{% if not craft.app.request.getParam('redirect') %}#}
-{#            {{ "All 404's"|t('seo-fields') }}{% else %}{{ craft.app.request.getParam('redirect') == "handled" ? "Handled" : "Not handled" }}{% endif %}</div>#}
-{#    <div class="menu">#}
-{#        <ul class="padded">#}
-{#            <li>#}
-{#                <a href="{{ url('seo-fields/not-found' ) }}"#}
-{#                   {% if not craft.app.request.getParam('redirect') %}class="sel" {% endif %}>#}
-{#                    {{ "All 404's"|t('seo-fields') }}#}
-{#                </a>#}
-{#            </li>#}
-{#            <li>#}
-{#                <a href="{{ url(craft.app.request.getUrl(), { redirect: "handled"}) }}"#}
-{#                   {% if craft.app.request.getParam("redirect") == "handled" %}class="sel"{% endif %}>#}
-{#                    {{ "Handled" }}#}
-{#                </a>#}
-{#            </li>#}
-{#            <li>#}
-{#                <a href="{{ url(craft.app.request.getUrl(), { redirect: "not-handled"}) }}"#}
-{#                   {% if craft.app.request.getParam("redirect") == "not-handled" %}class="sel"{% endif %}>#}
-{#                    {{ "Not handled" }}#}
-{#                </a>#}
-{#            </li>#}
-{#        </ul>#}
-{#    </div>#}
 {% endblock %}
 
 
@@ -115,10 +90,16 @@
 
     ];
 
+    {% if craft.app.sites.getEditableSites()|length < 2 %}
+        {% set site =  "" %}
+    {% else %}
+        {% set site = craft.app.request.getQueryParam('site', '') %}
+    {% endif %}
+
     new Craft.VueAdminTable({
     container: '#seofields-notfound',
     columns: columns,
-    tableDataEndpoint: "{{ cpUrl('seo-fields/cp-api/not-found', {site: craft.app.request.getQueryParam('site', '')} ) }}" ,
+    tableDataEndpoint: "{{ cpUrl('seo-fields/cp-api/not-found', {site: site ) }}" ,
     deleteAction: 'seo-fields/not-found/delete',
     checkboxes:  0,
     search: true,

diff --git a/src/templates/_redirect/_index.twig b/src/templates/_redirect/_index.twig
@@ -95,14 +95,20 @@
         }
     ];
 
+    {% if craft.app.sites.getEditableSites()|length < 2 %}
+        {% set site =  "" %}
+    {% else %}
+        {% set site = craft.app.request.getQueryParam('site', '') %}
+    {% endif %}
+
     new Craft.VueAdminTable({
     container: '#seofields-redirects',
     columns: columns,
-    tableDataEndpoint: "{{ cpUrl('seo-fields/cp-api/redirects', {site: craft.app.request.getQueryParam('site', '')} ) }}" ,
+    tableDataEndpoint: "{{ cpUrl('seo-fields/cp-api/redirects', {site : site} ) }}" ,
     deleteAction: 'seo-fields/redirects/delete',
     checkboxes:  0,
     search: true,
-    allowMultipleSelections: false,
-    });
+    allowMultipleSelections: false
+});
 
 {% endjs %}