Skip to content

Commit

Permalink
SIO-1830 Upgrade django-registration dependency
Browse files Browse the repository at this point in the history
Change-Id: I646e23c6019a11507599d67ef9fc8af3710f23f6
  • Loading branch information
AdiNar committed May 29, 2017
1 parent 7133f74 commit 2a31c46
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 deletions.
18 changes: 11 additions & 7 deletions oioioi/base/registration_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,28 @@
class RegistrationView(DefaultRegistrationView):
form_class = RegistrationFormWithNames

def register(self, request, username, password1, email, first_name,
last_name, **kwargs):
user = User.objects.create_user(username, email, password1)
user.first_name = first_name
user.last_name = last_name
def register(self, form):
data = form.cleaned_data
request = self.request

user = User.objects.create_user(data['username'],
data['email'], data['password1'])
user.first_name = data['first_name']
user.last_name = data['last_name']
user.is_active = not settings.SEND_USER_ACTIVATION_EMAIL
user.save()

registration_profile = RegistrationProfile.objects.create_profile(user)
signals.user_registered.send(sender=self.__class__, user=user,
request=request)
request=request)
if settings.SEND_USER_ACTIVATION_EMAIL:
registration_profile.send_activation_email(RequestSite(request))
else:
signals.user_activated.send(sender=self.__class__, user=user,
request=request)
request=request)
return user


urlpatterns = patterns('',
url(r'^register/$',
RegistrationView.as_view(),
Expand Down
9 changes: 1 addition & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,7 @@
"django-nose>=1.4",
"nose-picker>=0.5.3",

# The newer version changes API of RegistrationForm, causing the
# following error:
#
# File lib/python2.7/site-packages/registration/views.py",
# line 94, in form_valid
# new_user = self.register(request, form)
# TypeError: register() takes exactly 7 arguments (3 given)
"django-registration-redux==1.1",
"django-registration-redux>=1.6",

"Celery>=3.1.15,<4.0.0",
"django-celery>=3.1.15,<=3.1.17",
Expand Down

0 comments on commit 2a31c46

Please sign in to comment.