Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from R4stl1n/master

Browse Source 
update
This commit is contained in:
Mr McClain 2016-02-23 18:15:01 -06:00
commit 974698fe2c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
notifications/handlers.py
View File

@ -13,6 +13,7 @@ class NotificationHandler(logging.Handler):
notif.title = "%s [%s:%s]" % (record.levelname, record.funcName, record.lineno) notif.title = "%s [%s:%s]" % (record.levelname, record.funcName, record.lineno)
notif.level = str([item[0] for item in Notification.LEVEL_CHOICES if item[1] == record.levelname][0]) notif.level = str([item[0] for item in Notification.LEVEL_CHOICES if item[1] == record.levelname][0])
message = record.getMessage() message = record.getMessage()
if record.exc_text:
message = message + "\n\n" message = message + "\n\n"
message = message + record.exc_text message = message + record.exc_text
notif.message = message notif.message = message

2
services/managers/openfire_manager.py
View File

@ -103,6 +103,8 @@ class OpenfireManager:
remote_groups = [] remote_groups = []
if response: if response:
remote_groups = response['groupname'] remote_groups = response['groupname']
if isinstance(remote_groups, basestring):
remote_groups = [remote_groups]
logger.debug("Openfire user %s has groups %s" % (username, remote_groups)) logger.debug("Openfire user %s has groups %s" % (username, remote_groups))
add_groups = [] add_groups = []
del_groups = [] del_groups = []