Skip to content

Commit

Permalink
Merge pull request #87 from alecghica/master
Browse files Browse the repository at this point in the history
Fix for issue #86
  • Loading branch information
jensens committed Nov 16, 2019
2 parents 5f6741b + adf09d1 commit d8727de
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGES.rst
Expand Up @@ -5,6 +5,10 @@ History
1.7.0 (unreleased)
------------------

- Fixed error display for /plone_ldapcontrolpanel when a wrong value is
provided for the "Groups container DN" field.
[alecghica]

- Fixed error adding a Plone user group.
[iulianpetchesi]

Expand Down
6 changes: 5 additions & 1 deletion src/pas/plugins/ldap/plugin.py
Expand Up @@ -331,7 +331,11 @@ def getGroupsForPrincipal(self, principal, request=None):
if self.groups:
# XXX: provide group_ids function in UGM! Way too calculation-heavy
# now
return [_.id for _ in _principal.groups]
try:
return [_.id for _ in _principal.groups]
except Exception:
logger.exception("Problems with groups settings!")
return default
return default

# ##
Expand Down

0 comments on commit d8727de

Please sign in to comment.