ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-03 19:49:35 +02:00
commit 1b81cfee27
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/participant/models.py
View File

@ -39,6 +39,7 @@ class Profile(models.Model):
def reset_password(self): def reset_password(self):
self.user.set_password(self.firstpassword) self.user.set_password(self.firstpassword)
self.user.save()
def __unicode__(self): def __unicode__(self):
if self.group: if self.group:

1
openslides/participant/views.py
View File

@ -20,6 +20,7 @@ from django.contrib.auth.forms import SetPasswordForm
from django.contrib import messages from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from participant.models import Profile, set_first_user_passwords from participant.models import Profile, set_first_user_passwords
from participant.api import gen_username from participant.api import gen_username
from participant.forms import UserForm, UsernameForm, ProfileForm, UsersettingsForm, UserImportForm, GroupForm, AdminPasswordChangeForm from participant.forms import UserForm, UsernameForm, ProfileForm, UsersettingsForm, UserImportForm, GroupForm, AdminPasswordChangeForm