github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-24 05:31:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: switch panel back to forum last known url (#31092)

Browse Source 
Previously the return to forum link would automatically take you to the
forum homepage, however this was not intended functionality. We should
attempt to take the user to their last viewed forum page.

This change fixes a bug in how we determined what the destination link
should be.

Internal ref: /t/110508
This commit is contained in:
David Battersby 2025-01-31 17:18:24 +04:00 committed by GitHub
parent 4e2a982e91
commit 8ca2c14874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/sidebar/switch-panel-buttons.gjs
View File

@ -16,7 +16,7 @@ export default class SwitchPanelButtons extends Component {
this.isSwitching = true;
this.sidebarState.currentPanel.lastKnownURL = this.router.currentURL;
const destination = panel?.switchButtonDefaultUrl || panel?.lastKnownURL;
const destination = panel?.switchButtonDefaultUrl;
if (!destination) {
return;
}

2
app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
View File

@ -21,7 +21,7 @@ class MainSidebarPanel {
}
get switchButtonDefaultUrl() {
return "/";
return this?.lastKnownURL || "/";
}
}

2
plugins/chat/spec/system/separate_sidebar_mode_spec.rb
View File

@ -221,7 +221,7 @@ RSpec.describe "Separate sidebar mode", type: :system do
expect(channel_browse_page.component).to be_present
sidebar_component.switch_to_main
expect(page).to have_current_path("/discuss/")
expect(page).to have_current_path("/discuss/about")
end
end
end