Skip to content
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.

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

Configuration: Fix changing org preferences in FireFox #35549

Merged
merged 1 commit into from Jun 11, 2021

Conversation

hugohaggmark
Copy link
Contributor

@hugohaggmark hugohaggmark commented Jun 11, 2021

What this PR does / why we need it:
What I could find was that we were reloading the window before the result was received from the backend which resulted in NS_BINDING_ABORTED error in FireFox. This PR adds an await before reloading the page.

Which issue(s) this PR fixes:
Fixes #35503

Special notes for your reviewer:

@hugohaggmark hugohaggmark added this to the 8.0.2 milestone Jun 11, 2021
@hugohaggmark hugohaggmark self-assigned this Jun 11, 2021
@hugohaggmark hugohaggmark requested review from a team, mckn and oscarkilhed and removed request for a team June 11, 2021 09:24
@hugohaggmark hugohaggmark changed the title Configuration: Fix changing org preferences on FireFox Configuration: Fix changing org preferences in FireFox Jun 11, 2021
Copy link
Member

@dprokop dprokop left a comment

Choose a reason for hiding this comment

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

Good catch @hugohaggmark, this looks good and works as expected.

@hugohaggmark hugohaggmark enabled auto-merge (squash) June 11, 2021 09:49
@hugohaggmark hugohaggmark merged commit 1838e6b into main Jun 11, 2021
@hugohaggmark hugohaggmark added the old backport v8.0.x Mark PR for automatic backport to v8.0.x label Jun 11, 2021
@hugohaggmark hugohaggmark deleted the hugoh/issue-org-prefs branch June 11, 2021 09:49
@grafanabot
Copy link
Contributor

The backport to v8.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-35549-to-v8.0.x origin/v8.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 1838e6b7749ba291c5c2d44fe8e8f20338d05372
# Push it to GitHub
git push --set-upstream origin backport-35549-to-v8.0.x
git switch main
# Remove the local backport branch
git branch -D backport-35549-to-v8.0.x

Then, create a pull request where the base branch is v8.0.x and the compare/head branch is backport-35549-to-v8.0.x.

grafanabot pushed a commit that referenced this pull request Jun 11, 2021
hugohaggmark added a commit that referenced this pull request Jun 11, 2021
(cherry picked from commit 1838e6b)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/admin/user area/configuration For issues concerning configuring Grafana area/frontend old backport v8.0.x Mark PR for automatic backport to v8.0.x type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grafana 8.0.0: Preferences not saved when using Firefox
3 participants