refactor: Always display the type menu and enforce editing the specif…

…ic type
nystudio107 · Jan 15, 2025 · c3a7a4c · c3a7a4c
1 parent b9d1b92
commit c3a7a4c
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/src/controllers/SettingsController.php b/src/controllers/SettingsController.php
@@ -527,18 +527,12 @@ public function actionEditContent(
         }
         $variables['typeMenu'] = $typeMenu;
         $variables['currentTypeId'] = null;
-        $variables['specificTypeId'] = null;
-        if (count($typeMenu) > 1) {
+        if (!empty($typeMenu)) {
             $currentType = reset($typeMenu);
             $variables['currentType'] = $typeMenu[$typeId] ?? $currentType;
             $variables['currentTypeId'] = $typeId ?? key($typeMenu);
             $typeId = (int)$variables['currentTypeId'];
         }
-        // If there's only one EntryType, don't bother displaying the menu
-        if (count($typeMenu) === 1) {
-            $variables['typeMenu'] = [];
-            $variables['specificTypeId'] = $typeId ?? key($typeMenu);
-        }
         $pluginName = Seomatic::$settings->pluginName;
         // Asset bundle
         try {
@@ -648,7 +642,6 @@ public function actionSaveContent(): Response
         $sourceHandle = $request->getParam('sourceHandle');
         $siteId = $request->getParam('siteId');
         $typeId = $request->getParam('typeId') ?? null;
-        $specificTypeId = $request->getParam('specificTypeId') ?? null;
         $globalsSettings = $request->getParam('metaGlobalVars');
         $bundleSettings = $request->getParam('metaBundleSettings');
         $sitemapSettings = $request->getParam('metaSitemapVars');
@@ -687,12 +680,6 @@ public function actionSaveContent(): Response
             Seomatic::$plugin->metaBundles->syncBundleWithConfig($metaBundle, true);
             $metaBundle->typeId = $typeId;
             Seomatic::$plugin->metaBundles->updateMetaBundle($metaBundle, $siteId);
-            // If there's also a specific typeId associated with this section, save the same
-            // metabundle there too, to fix: https://github.com/nystudio107/craft-seomatic/issues/1557
-            if (!empty($specificTypeId)) {
-                $metaBundle->typeId = $specificTypeId;
-                Seomatic::$plugin->metaBundles->updateMetaBundle($metaBundle, $siteId);
-            }
 
             Seomatic::$plugin->clearAllCaches();
             Craft::$app->getSession()->setNotice(Craft::t('seomatic', 'SEOmatic content settings saved.'));