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

Teams hidden user #1841

Merged
merged 6 commits into from
Jul 26, 2020
Merged

Teams hidden user #1841

merged 6 commits into from
Jul 26, 2020

Conversation

kevinpapst
Copy link
Member

@kevinpapst kevinpapst commented Jul 26, 2020

Description

Fixes #1781

  • BC break/Bugfix allow to add disabled users to team (via API)
  • allow to include disabled users in user-select
  • include disabled users when editing team members (only if they are already part of the team)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • I verified that my code applies to the guidelines (composer code-check)
  • I updated the documentation (see here)
  • I agree that this code is used in Kimai and will be published under the MIT license

@codecov
Copy link

codecov bot commented Jul 26, 2020

Codecov Report

Merging #1841 into master will increase coverage by 0.00%.
The diff coverage is 95.83%.

@@            Coverage Diff            @@
##             master    #1841   +/-   ##
=========================================
  Coverage     92.96%   92.96%           
- Complexity     5152     5161    +9     
=========================================
  Files           488      489    +1     
  Lines         15961    15981   +20     
=========================================
+ Hits          14838    14857   +19     
- Misses         1123     1124    +1     
Impacted Files Coverage Δ Complexity Δ
src/API/TeamController.php 99.30% <ø> (-0.01%) 38.00 <0.00> (-1.00)
src/Form/Type/UserType.php 94.11% <75.00%> (-5.89%) 4.00 <0.00> (+2.00) ⬇️
src/Form/TeamEditForm.php 100.00% <100.00%> (ø) 4.00 <0.00> (+2.00)
src/Repository/Query/BaseFormTypeQuery.php 100.00% <100.00%> (ø) 32.00 <1.00> (+1.00)
src/Repository/Query/UserFormTypeQuery.php 100.00% <100.00%> (ø) 2.00 <2.00> (?)
src/Repository/UserRepository.php 83.87% <100.00%> (+0.87%) 45.00 <0.00> (+3.00)

@kevinpapst kevinpapst marked this pull request as ready for review July 26, 2020 11:10
@kevinpapst kevinpapst merged commit 130e6ac into master Jul 26, 2020
@kevinpapst kevinpapst deleted the teams-hidden-user branch July 26, 2020 11:13
pinedev pushed a commit to pinedevstudio/kimai2 that referenced this pull request Mar 23, 2021
* allow to add disabled users to team
* allow to include disabled users in user-select
* include disabled users when editing team members ONLY if they are already part of team
@github-actions github-actions bot locked and limited conversation to collaborators Oct 6, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deactivated users and team assignments
1 participant