diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-03-04 06:29:32 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-03-04 06:29:32 +0100 |
| commit | 69227893a307e9c2ab5230f53cecb0a5313fc445 (patch) | |
| tree | 457174f5b57257fb5200ba6e60b94e247560cca1 /meetingtools | |
| parent | bba73b2ae3bc7d94276eb59dc9210b281fd324eb (diff) | |
import loop fix
Diffstat (limited to 'meetingtools')
| -rw-r--r-- | meetingtools/apps/auth/views.py | 2 | ||||
| -rw-r--r-- | meetingtools/apps/room/tasks.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meetingtools/apps/auth/views.py b/meetingtools/apps/auth/views.py index 807150c..ff7a932 100644 --- a/meetingtools/apps/auth/views.py +++ b/meetingtools/apps/auth/views.py @@ -146,7 +146,7 @@ def accounts_login_federated(request): 'ext-login':request.user.username}) #co_import_from_request(request) - import_user_rooms(api, request.user) + import_user_rooms(acc, api, request.user) member_or_employee = _is_member_or_employee(request.user) for gn in ('live-admins','seminar-admins'): diff --git a/meetingtools/apps/room/tasks.py b/meetingtools/apps/room/tasks.py index b04c0ff..08cc349 100644 --- a/meetingtools/apps/room/tasks.py +++ b/meetingtools/apps/room/tasks.py @@ -165,7 +165,8 @@ def _user_meeting_folder(user,api): #folder = next((f for f in folders if f.findtext('.//folder-name') == 'User Meetings'), None) return folders[0].get('sco-id') -def import_user_rooms(api, user): + +def import_user_rooms(acc, api, user): mf_sco_id = _user_meeting_folder(user, api) if mf_sco_id > 0: r = api.request('sco_contents', {'filter-type': 'meeting', 'sco_id': mf_sco_id}) |