Redirect edit pages to the previous page on save

packages/craftcms-vue/admintable/App.vue

@@ -498,7 +498,7 @@
         isEmpty: false,
         isLoading: true,
         searchClearTitle: Craft.escapeHtml(Craft.t('app', 'Clear')),
-        searchTerm: '',
+        searchTerm: new URL(window.location.href).searchParams.get('q') || '',
         selectAll: null,
         sortable: null,
         tableBodySelector: '.vuetable-body',
@@ -717,6 +717,10 @@
           }
           this.reload();
         }
+
+        const url = new URL(window.location.href);
+        url.searchParams.set('q', this.searchTerm);
+        window.history.replaceState({}, '', url);
       }, 500),
 
       resetSearch: function () {

src/controllers/ElementsController.php

@@ -347,7 +347,7 @@ public function actionEdit(?ElementInterface $element, ?int $elementId = null):
         $type = $element::lowerDisplayName();
         $enabledForSite = $element->getEnabledForSite();
         $hasRoute = $element->getRoute() !== null;
-        $redirectUrl = ElementHelper::postEditUrl($element);
+        $redirectUrl = UrlHelper::cpReferralUrl() ?? $element->getPostEditUrl() ?? Craft::$app->getConfig()->getGeneral()->getPostCpLoginRedirect();
 
         // Site statuses
         if ($canEditMultipleSites) {

src/controllers/EntryTypesController.php

@@ -16,6 +16,7 @@
 use craft\fieldlayoutelements\entries\EntryTitleField;
 use craft\helpers\Cp;
 use craft\helpers\Html;
+use craft\helpers\UrlHelper;
 use craft\models\EntryType;
 use craft\models\Section;
 use craft\web\Controller;
@@ -92,7 +93,7 @@ public function actionEdit(?int $entryTypeId = null, ?EntryType $entryType = nul
             ->addCrumb(Craft::t('app', 'Settings'), 'settings')
             ->addCrumb(Craft::t('app', 'Entry Types'), 'settings/entry-types')
             ->action('entry-types/save')
-            ->redirectUrl('settings/entry-types')
+            ->redirectUrl(UrlHelper::cpReferralUrl() ?? 'settings/entry-types')
             ->addAltAction(Craft::t('app', 'Save and continue editing'), [
                 'redirect' => 'settings/entry-types/{id}',
                 'shortcut' => true,

src/controllers/FieldsController.php

@@ -177,7 +177,7 @@ public function actionEditField(?int $fieldId = null, ?FieldInterface $field = n
             ->addCrumb(Craft::t('app', 'Settings'), 'settings')
             ->addCrumb(Craft::t('app', 'Fields'), 'settings/fields')
             ->action('fields/save-field')
-            ->redirectUrl('settings/fields')
+            ->redirectUrl(UrlHelper::cpReferralUrl() ?? 'settings/fields')
             ->addAltAction(Craft::t('app', 'Save and continue editing'), [
                 'redirect' => 'settings/fields/edit/{id}',
                 'shortcut' => true,

src/helpers/UrlHelper.php

@@ -574,6 +574,29 @@ public static function cpHost(): string
         return static::hostInfo(static::baseCpUrl());
     }
 
+    /**
+     * Returns a CP referral URL.
+     *
+     * @return string|null
+     * @since 5.6.0
+     */
+    public static function cpReferralUrl(): ?string
+    {
+        $referrer = Craft::$app->getRequest()->getReferrer();
+
+        // Make sure it didn't refer itself
+        if ($referrer === Craft::$app->getRequest()->getFullUri()) {
+            return null;
+        }
+
+        // Make sure the CP referred it
+        if (!str_contains($referrer, self::baseCpUrl())) {
+            return null;
+        }
+
+        return $referrer;
+    }
+
     /**
      * Parses a URL for the host info.
      *