Skip to content

Commit ef415ff

Browse files
committed
Add support for django 1.7
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Singed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
1 parent 7e5b855 commit ef415ff

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

conversejs/forms.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ class XMPPAccountForm(forms.ModelForm):
88

99
class Meta:
1010
model = XMPPAccount
11+
exclude = ()

conversejs/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from django.db import models
33

44
try:
5-
from django.contrib.auth import get_user_model
5+
from django.conf import settings
66
except ImportError:
77
from django.contrib.auth.models import User
88
else:
9-
User = get_user_model()
9+
User = settings.AUTH_USER_MODEL
1010

1111

1212
class XMPPAccount(models.Model):

0 commit comments

Comments
 (0)