equal
deleted
inserted
replaced
376 return link_name |
376 return link_name |
377 |
377 |
378 def clean_id(self): |
378 def clean_id(self): |
379 new_email = self.cleaned_data.get('id') |
379 new_email = self.cleaned_data.get('id') |
380 form_id = users.User(email=new_email) |
380 form_id = users.User(email=new_email) |
381 if models.user.logic.getFromFields(email=form_id): |
381 if models.user.logic.getFromFields(email=form_id.email()): |
382 raise forms.ValidationError("This account is already in use.") |
382 raise forms.ValidationError("This account is already in use.") |
383 return form_id |
383 return form_id |
384 |
384 |
385 |
385 |
386 DEF_SITE_CREATE_USER_PROFILE_TMPL = 'soc/site/user/profile/edit.html' |
386 DEF_SITE_CREATE_USER_PROFILE_TMPL = 'soc/site/user/profile/edit.html' |
418 'link_name': link_name, |
418 'link_name': link_name, |
419 'nick_name': form.cleaned_data.get('nick_name'), |
419 'nick_name': form.cleaned_data.get('nick_name'), |
420 'is_developer': form.cleaned_data.get('is_developer'), |
420 'is_developer': form.cleaned_data.get('is_developer'), |
421 } |
421 } |
422 |
422 |
423 user = models.user.logic.updateOrCreateFromFields(properties, email=form_id) |
423 user = models.user.logic.updateOrCreateFromFields(properties, email=form_id.email()) |
424 |
424 |
425 if not user: |
425 if not user: |
426 return http.HttpResponseRedirect('/') |
426 return http.HttpResponseRedirect('/') |
427 |
427 |
428 # redirect to new /site/user/profile/new_link_name?s=0 |
428 # redirect to new /site/user/profile/new_link_name?s=0 |