--- a/src/hdalab/views/profile.py Thu Mar 19 23:56:52 2015 +0100
+++ b/src/hdalab/views/profile.py Fri Mar 20 00:04:18 2015 +0100
@@ -8,14 +8,11 @@
from datetime import datetime
import json
import logging
-from renkanmanager.models import Renkan
-from renkanmanager.utils import LineNodePlacer, HorLineNodePlacer, renkan_copier, renkan_deleter, \
- CircleNodePlacer
+from renkanmanager.views import RenkanGetPut
import uuid
from django.conf import settings
-from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login, \
- get_user_model
+from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.sites.models import get_current_site
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
@@ -35,7 +32,9 @@
from django.views.decorators.debug import sensitive_post_parameters
from django.views.generic import TemplateView, View
from django.views.generic.edit import UpdateView
-from renkanmanager.views import RenkanGetPut
+from renkanmanager.models import Renkan
+from renkanmanager.utils import LineNodePlacer, HorLineNodePlacer, renkan_copier, renkan_deleter, \
+ CircleNodePlacer
from hdabo.models import Tag, Datasheet, TaggedSheet, Folder
from hdalab.forms import HdalabRenkanStateForm, HdalabRenkanFavoriteForm
@@ -44,6 +43,7 @@
from hdalab.services import change_renkan_state
from hdalab.views.ajax import filter_generic
+
logger = logging.getLogger(__name__)
@@ -697,7 +697,6 @@
class UserProfileUpdate(UpdateView):
- model = get_user_model()
fields = ['email']
template_name_suffix = '_update_form'