Skip to content

Redirect edit pages to the previous page on save #16140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: 5.x
Choose a base branch
from
Open

Redirect edit pages to the previous page on save #16140

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b26c9ab
Updates redirect URLs for elements to the referrer
brianjhanson Nov 18, 2024
fae5580
Persist search terms to URL
brianjhanson Nov 18, 2024
62a64b3
Redirect fields back to referrer
brianjhanson Nov 18, 2024
dac1e13
More resilient
brianjhanson Nov 18, 2024
f929366
Redirect EntryTypes back to referrer
brianjhanson Nov 18, 2024
aa37e47
Build
brianjhanson Nov 18, 2024
917e740
Merge branch '5.6' of github.com:craftcms/cms into feature/cms-655-re…
brianjhanson Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/craftcms-vue/admintable/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -717,6 +717,10 @@
}
this.reload();
}
const url = new URL(window.location.href);
url.searchParams.set('q', this.searchTerm);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brandonkelly I don't think using q here will cause any issues, but if you think it's likely to run into another query param, we can use something else.

window.history.replaceState({}, '', url);
}, 500),
resetSearch: function () {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/ElementsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/FieldsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
23 changes: 23 additions & 0 deletions src/helpers/UrlHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down