diff options
Diffstat (limited to 'meetingtools')
| -rw-r--r-- | meetingtools/apps/auth/views.py | 5 | ||||
| -rw-r--r-- | meetingtools/apps/room/tasks.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meetingtools/apps/auth/views.py b/meetingtools/apps/auth/views.py index 551d9cd..807150c 100644 --- a/meetingtools/apps/auth/views.py +++ b/meetingtools/apps/auth/views.py @@ -8,14 +8,13 @@ from django.contrib.auth.models import User, Group import datetime from django.views.decorators.cache import never_cache import logging -from apps.room.tasks import import_user_rooms -from apps.room.views import user_meeting_folder +from meetingtools.apps.room.tasks import import_user_rooms from meetingtools.apps.userprofile.models import UserProfile from meetingtools.multiresponse import redirect_to, make_response_dict from meetingtools.ac import ac_api_client from django.shortcuts import render_to_response from django.contrib import auth -from django_co_connector.models import co_import_from_request, add_member,remove_member +from django_co_connector.models import co_import_from_request, add_member, remove_member from meetingtools.apps.cluster.models import acc_for_user from django.conf import settings diff --git a/meetingtools/apps/room/tasks.py b/meetingtools/apps/room/tasks.py index 6c4e86b..59b3bea 100644 --- a/meetingtools/apps/room/tasks.py +++ b/meetingtools/apps/room/tasks.py @@ -5,7 +5,7 @@ Created on Jan 18, 2012 ''' from celery.task import periodic_task,task from celery.schedules import crontab -from apps.room.views import user_meeting_folder +from meetingtools.apps.room.views import user_meeting_folder from meetingtools.apps.sco.models import get_sco from meetingtools.apps.cluster.models import ACCluster from meetingtools.ac import ac_api_client @@ -22,6 +22,7 @@ from django.contrib.humanize.templatetags import humanize from django.conf import settings from django.core.mail import send_mail + def _owner_username(api,acc,sco): logging.debug(sco) key = 'ac:owner:%s/%s' % (acc,sco.get('sco-id')) |