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.

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

TSK-1086: Fix merge #2961

Merged
merged 1 commit into from
Apr 12, 2023
Merged

TSK-1086: Fix merge #2961

merged 1 commit into from
Apr 12, 2023

Conversation

haiodo
Copy link
Member

@haiodo haiodo commented Apr 12, 2023

Contribution checklist

Brief description

  • Fix search for Employee
  • Fix EmployeeAccount errors on connect
  • Reindex all fields.
  • Fix few NPEs

Checklist

  • - UI test added to added/changed functionality?
  • - Screenshot is added to PR if applicable ?
  • - Does the code work? Check whether function and logic are correct.
  • - Does Changelog.md is updated with changes?
  • - Does the translations are up to date?
  • - Does it well tested?
  • - Tested for Chrome.
  • - Tested for Safari.
  • - Go through the changed code looking for typos, TODOs, commented LOCs, debugging pieces of code, etc.
  • - Rebase your branch onto master and upstream branch
  • - Is there any redundant or duplicate code?
  • - Are required links are linked to PR?
  • - Does new code is well documented ?

Related issues

A list of closed updated issues

@haiodo
TSK-1086: Fix merge
7626c30 
* Fix search for Employee
* Fix EmployeeAccount errors on connect
* Reindex all fields.
* Fix few NPEs

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
@haiodo haiodo requested a review from BykhovDenis April 12, 2023 11:45
BykhovDenis
BykhovDenis approved these changes Apr 12, 2023
View reviewed changes
plugins/contact-resources/src/components/MergeEmployee.svelte
@@ -234,7 +234,7 @@
<EmployeeBox
showNavigate={false}
label={contact.string.MergeEmployeeTo}
docQuery={{ active: true }}
docQuery={{ active: { $in: [true, false] } }}
Copy link
Member

Choose a reason for hiding this comment

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

Why not {}?

@haiodo haiodo merged commit 341aa4d into main Apr 12, 2023
@haiodo haiodo deleted the TSK-1086 branch April 12, 2023 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BykhovDenis BykhovDenis BykhovDenis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@haiodo @BykhovDenis