Skip to content
Snippets Groups Projects
Unverified Commit eaca7607 authored by Simon Knox's avatar Simon Knox Committed by GitLab
Browse files

Merge branch 'psi-no-modal-no-cry' into 'master'

Don't show note from background item in work item modal

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169398



Merged-by: default avatarSimon Knox <simon@gitlab.com>
Approved-by: default avatarDeepika Guliani <dguliani@gitlab.com>
parents 51342bf6 87cd2f71
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -183,7 +183,11 @@ export default {
return true;
});
 
if (this.previewNote && !this.previewNoteLoadedInList) {
// don't show preview in modal, as we might accidentally load a note from the parent work item
const urlParams = new URLSearchParams(window.location.search);
const modalOpen = urlParams.has('show');
if (this.previewNote && !this.previewNoteLoadedInList && !modalOpen) {
const preview = {
notes: {
nodes: [this.previewNote],
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment