Merge lp://staging/~therp-nl/therp-addons/6.1_ldap_nonexistent_conf into lp://staging/~therp-nl/therp-addons/6.1
Proposed by
Holger Brunn (Therp)
| Status: | Merged |
|---|---|
| Merged at revision: | 98 |
| Proposed branch: | lp://staging/~therp-nl/therp-addons/6.1_ldap_nonexistent_conf |
| Merge into: | lp://staging/~therp-nl/therp-addons/6.1 |
| Diff against target: |
20 lines (+3/-1) 1 file modified
users_ldap_populate/model/users_ldap.py (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~therp-nl/therp-addons/6.1_ldap_nonexistent_conf |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stefan Rijnhart (Opener) (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This fixes the rather pathological case when you pass nonexistent res.company.ldap ids to action_populate. Without this patch, you end up with all users (except admin) being deactivated.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There's a story behind every proposal.