8000 fix(Note): make note show up only on login (backport #32228) by mergify[bot] · Pull Request #32625 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(Note): make note show up only on login (backport #32228) #32625

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

Jump to bottom
Merged
merged 5 commits into from
May 23, 2025
Merged

fix(Note): make note show up only on login (backport #32228) #32625

merged 5 commits into from
May 23, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 21, 2025

The issue here is a Note dialog doesnt show up on the "every login" it shows up on every reload.
This PR fixes that
Reference ticket https://support.frappe.io/helpdesk/tickets/35974

Before:

wrong.note.mov

After

note.on.login.mov
This is an automatic backport of pull request #32228 done by [Mergify](https://mergify.com).

sokumon added 2 commits May 21, 2025 14:25
@sokumon @mergify
fix(Note): make note show up only on login
ca65388 
(cherry picked from commit 67c1d13)

# Conflicts:
#	frappe/desk/doctype/note/note.py
@sokumon @mergify
fix(test): fetch unseen notes
5802d70 
(cherry picked from commit 932d5cc)

# Conflicts:
#	frappe/tests/test_boot.py
@mergify mergify bot added the conflicts label May 21, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented May 21, 2025

Cherry-pick of 67c1d13 has failed:

On branch mergify/bp/version-15-hotfix/pr-32228
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 67c1d13f91.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/hooks.py
	modified:   frappe/public/js/frappe/desk.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/doctype/note/note.py

Cherry-pick of 932d5cc has failed:

On branch mergify/bp/version-15-hotfix/pr-32228
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 932d5ccc08.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/test_boot.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@sokumon sokumon assigned sokumon and unassigned sokumon May 21, 2025
@sokumon sokumon removed the conflicts label May 21, 2025
@sokumon sokumon merged commit 32a909b into version-15-hotfix May 23, 2025
17 checks passed
@sokumon sokumon deleted the mergify/bp/version-15-hotfix/pr-32228 branch May 23, 2025 10:24
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.69.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 11, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@sokumon sokumon

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @sokumon
0