py_tasks_melange: comparison app/soc/views/site/user/profile.py

equal deleted inserted replaced

-:9b07ddeb1412
+:94834a1e6c01
 from django import forms
 from django import http
 from django.utils.translation import ugettext_lazy
+from soc.logic import accounts
 from soc.logic import models
 from soc.logic import out_of_band
 from soc.logic import validate
-from soc.logic.site import id_user
 from soc.views import simple
 from soc.views import helper
 from soc.views.helper import access
 from soc.views.helper import decorators
 from soc.views.user import profile
 required Properties of the User model need to sometimes be omitted.
 Also, this form only permits entry and editing  of some of the User entity
 Properties, not all of them.
 """
-id = forms.EmailField(required=False,
+account = forms.EmailField(required=False,
-label=soc.models.user.User.id.verbose_name,
+label=soc.models.user.User.account.verbose_name,
-help_text=soc.models.user.User.id.help_text)
+help_text=soc.models.user.User.account.help_text)
 link_name = forms.CharField(required=False,
 label=soc.models.user.User.link_name.verbose_name,
 help_text=soc.models.user.User.link_name.help_text)
 if not validate.isLinkNameFormatValid(link_name):
 raise forms.ValidationError('This link name is in wrong format.')
 return link_name
-def clean_id(self):
+def clean_account(self):
-email = self.cleaned_data.get('id')
+email = self.cleaned_data.get('account')
 if not email:
 # email not supplied (which is OK), so do not try to convert it
 return None
 if request.method == 'POST':
 form = LookupForm(request.POST)
 if form.is_valid():
-form_id = form.cleaned_data.get('id')
+form_account = form.cleaned_data.get('account')
-if form_id:
+if form_account:
 # email provided, so attempt to look up user by email
-user = models.user.logic.getForFields({'id': form_id}, unique=True)
+user = models.user.logic.getForFields(
+{'account': form_account}, unique=True)
 if user:
 lookup_message = ugettext_lazy('User found by email.')
 else:
 email_error = ugettext_lazy('User with that email not found.')
 range_width = helper.lists.getPreferredListPagination()
-nearest_user_range_start = id_user.findNearestUsersOffset(
+nearest_user_range_start = (
-range_width, id=form_id)
+models.user.logic.findNearestEntitiesOffset(
+width, [('account', form_account)]))
 if nearest_user_range_start is not None:
 context['lookup_link'] = './list?offset=%s&limit=%s' % (
 nearest_user_range_start, range_width)
 if not user:
 # user not found yet, so see if link name was provided
 link_name = form.cleaned_data.get('link_name')
 if link_name:
 # link name provided, so try to look up by link name
-user = id_user.getUserFromLinkName(link_name)
+user = models.user.logic.getForFields({'link_name': link_name},
+unique=True)
 if user:
 lookup_message = ugettext_lazy('User found by link name.')
 # clear previous error, since User was found
 email_error = None
 # clear previous lookup_link, since User was found, the lookup_link
 else:
 context['link_name_error'] = ugettext_lazy(
 'User with that link name not found.')
 if context['lookup_link'] is None:
 range_width = helper.lists.getPreferredListPagination()
-nearest_user_range_start = id_user.findNearestUsersOffset(
+nearest_user_range_start = (
-range_width, link_name=link_name)
+models.user.logic.findNearestEntitiesOffset(
+width, [('link_name', link_name)]))
 if nearest_user_range_start is not None:
 context['lookup_link'] = './list?offset=%s&limit=%s' % (
 nearest_user_range_start, range_width)
 # else: form was not valid
 # else:  # method == 'GET'
 if user:
 # User entity found, so populate form with existing User information
 # context['found_user'] = user
-form = LookupForm(initial={'id': user.id.email(),
+form = LookupForm(initial={'account': user.account.email(),
 'link_name': user.link_name})
 if request.path.endswith('lookup'):
 # convert /lookup path into /profile/link_name path
 context['edit_link'] = helper.requests.replaceSuffix(
 This form is manually specified, instead of using
 model = soc.models.user.User
 in the Meta class, because the form behavior is unusual and normally
 required Properties of the User model need to sometimes be omitted.
 """
-id = forms.EmailField(
+account = forms.EmailField(
-label=soc.models.user.User.id.verbose_name,
+label=soc.models.user.User.account.verbose_name,
-help_text=soc.models.user.User.id.help_text)
+help_text=soc.models.user.User.account.help_text)
 link_name = forms.CharField(
 label=soc.models.user.User.link_name.verbose_name,
 help_text=soc.models.user.User.link_name.help_text)
 raise forms.ValidationError("This link name is in wrong format.")
 key_name = self.data.get('key_name')
 user = models.user.logic.getFromKeyName(key_name)
-linkname_user_exist = id_user.getUserFromLinkName(link_name)
+linkname_user_exist = models.user.logic.getForFields(
+{'link_name': link_name}, unique=True)
 if (user and user.link_name != link_name) and linkname_user_exist:
 raise forms.ValidationError("This link name is already in use.")
 return link_name
-def clean_id(self):
+def clean_account(self):
-form_id = users.User(email=self.cleaned_data.get('id'))
+form_account = users.User(email=self.cleaned_data.get('account'))
-if not id_user.isIdAvailable(
+if not accounts.isAccountAvailable(
-form_id, existing_key_name=self.data.get('key_name')):
+form_account, existing_key_name=self.data.get('key_name')):
 raise forms.ValidationError("This account is already in use.")
-if models.user.logic.isFormerId(form_id):
+if models.user.logic.isFormerAccount(form_account):
 raise forms.ValidationError("This account is invalid. "
-"It exists as former id.")
+"It exists as a former account.")
-return form_id
+return form_account
 DEF_SITE_USER_PROFILE_EDIT_TMPL = 'soc/user/edit.html'
 DEF_CREATE_NEW_USER_MSG = ' You can create a new user by visiting' \
 ' <a href="/site/user/profile">Create ' \
 user = None  # assume that no User entity will be found
 # try to fetch User entity corresponding to link_name if one exists
 try:
 if link_name:
-user = id_user.getUserFromLinkNameOr404(link_name)
+user = accounts.getUserFromLinkNameOr404(link_name)
 except out_of_band.ErrorResponse, error:
 # show custom 404 page when link name doesn't exist in Datastore
 error.message = error.message + DEF_CREATE_NEW_USER_MSG
 return simple.errorResponse(request, page, error, template, context)
 if form.is_valid():
 key_name = form.cleaned_data.get('key_name')
 new_link_name = form.cleaned_data.get('link_name')
 properties = {}
-properties['id'] = form.cleaned_data.get('id')
+properties['account'] = form.cleaned_data.get('account')
 properties['link_name']  = new_link_name
 properties['nick_name']  = form.cleaned_data.get('nick_name')
 properties['is_developer'] = form.cleaned_data.get('is_developer')
 user = models.user.logic.updateOrCreateFromKeyName(properties, key_name)
 request, profile.SUBMIT_MSG_PARAM_NAME,
 values=profile.SUBMIT_MESSAGES))
 # populate form with the existing User entity
 form = EditForm(initial={'key_name': user.key().name(),
-'id': user.id.email(), 'link_name': user.link_name,
+'account': user.account.email(), 'link_name': user.link_name,
 'nick_name': user.nick_name, 'is_developer': user.is_developer})
 else:
 if request.GET.get(profile.SUBMIT_MSG_PARAM_NAME):
 # redirect to aggressively remove 'Profile saved' query parameter
 return http.HttpResponseRedirect(request.path)
 This form is manually specified, instead of using
 model = soc.models.user.User
 in the Meta class, because the form behavior is unusual and normally
 required Properties of the User model need to sometimes be omitted.
 """
-id = forms.EmailField(
+account = forms.EmailField(
-label=soc.models.user.User.id.verbose_name,
+label=soc.models.user.User.account.verbose_name,
-help_text=soc.models.user.User.id.help_text)
+help_text=soc.models.user.User.account.help_text)
 link_name = forms.CharField(
 label=soc.models.user.User.link_name.verbose_name,
 help_text=soc.models.user.User.link_name.help_text)
 def clean_link_name(self):
 link_name = self.cleaned_data.get('link_name')
 if not validate.isLinkNameFormatValid(link_name):
 raise forms.ValidationError("This link name is in wrong format.")
 else:
-if id_user.getUserFromLinkName(link_name):
+if models.user.logic.getForFields({'link_name': link_name},
+unique=True):
 raise forms.ValidationError("This link name is already in use.")
 return link_name
-def clean_id(self):
+def clean_account(self):
-new_email = self.cleaned_data.get('id')
+new_email = self.cleaned_data.get('account')
-form_id = users.User(email=new_email)
+form_account = users.User(email=new_email)
-if models.user.logic.getForFields({'id': form_id}, unique=True):
+if models.user.logic.getForFields({'account': form_account}, unique=True):
 raise forms.ValidationError("This account is already in use.")
-if models.user.logic.isFormerId(form_id):
+if models.user.logic.isFormerAccount(form_account):
 raise forms.ValidationError("This account is invalid. "
-"It exists as former id.")
+"It exists as a former account.")
-return form_id
+return form_account
 DEF_SITE_CREATE_USER_PROFILE_TMPL = 'soc/user/edit.html'
 @decorators.view
 if request.method == 'POST':
 form = CreateForm(request.POST)
 if form.is_valid():
-form_id = form.cleaned_data.get('id')
+form_account = form.cleaned_data.get('account')
 link_name = form.cleaned_data.get('link_name')
 properties = {
-'id': form_id,
+'account': form_account,
 'link_name': link_name,
 'nick_name': form.cleaned_data.get('nick_name'),
 'is_developer': form.cleaned_data.get('is_developer'),
 }
-key_fields = {'email': form_id.email()}
+key_fields = {'email': form_account.email()}
 user = models.user.logic.updateOrCreateFromFields(properties,
 key_fields)
 if not user:
 return http.HttpResponseRedirect('/')

changeset 481	94834a1e6c01
parent 448	075360be6743
child 482	839740b061ad