py_tasks_melange: comparison app/soc/logic/cleaning.py

equal deleted inserted replaced

-:940f06d34787
+:9b18d612510a
 DEF_LINK_ID_IN_USE_MSG = ugettext(
 'This link ID is already in use, please specify another one')
+def check_field_is_empty(field_name):
+"""Returns decorator that bypasses cleaning for empty fields.
+"""
+def decorator(fun):
+"""Decorator that checks if a field is empty if so doesn't do the cleaning.
+Note Django will capture errors concerning required fields that are empty.
+"""
+from functools import wraps
+@wraps(fun)
+def wrapper(self):
+field_content = self.cleaned_data.get(field_name)
+if not field_content:
+# field has no content so bail out
+return field_content
+else:
+# field has contents
+return fun(self)
+return wrapper
+return decorator
 def clean_link_id(field_name):
 """Checks if the field_name value is in a valid link ID format.
 """
+@check_field_is_empty(field_name)
 def wrapper(self):
 # convert to lowercase for user comfort
 link_id = self.cleaned_data.get(field_name).lower()
 if not validate.isLinkIdFormatValid(link_id):
 raise forms.ValidationError("This link ID is in wrong format.")
 def clean_scope_path(field_name):
 """Checks if the field_name value is in a valid scope path format.
 """
+@check_field_is_empty(field_name)
 def wrapper(self):
 # convert to lowercase for user comfort
 scope_path = self.cleaned_data.get(field_name).lower()
 if not validate.isScopePathFormatValid(scope_path):
 raise forms.ValidationError("This scope path is in wrong format.")
 def clean_agrees_to_tos(field_name):
 """Checks if there is a ToS to see if it is allowed to leave
 the field_name field false.
 """
+@check_field_is_empty(field_name)
 def wrapper(self):
 agrees_to_tos = self.cleaned_data.get(field_name)
 if not site_logic.logic.getToS(site_logic.logic.getSingleton()):
 return agrees_to_tos
 def clean_existing_user(field_name):
 """Check if the field_name field is a valid user.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 link_id = clean_link_id(field_name)(self)
 user_entity = user_logic.logic.getForFields({'link_id': link_id},
 unique=True)
 def clean_user_not_exist(field_name):
 """Check if the field_name value is a valid link_id and a user with the
 link id does not exist.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 link_id = clean_link_id(field_name)(self)
 user_entity = user_logic.logic.getForFields({'link_id': link_id},
 unique=True)
 def clean_users_not_same(field_name):
 """Check if the field_name field is a valid user and is not
 equal to the current user.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 clean_user_field = clean_existing_user(field_name)
 user_entity = clean_user_field(self)
 def clean_user_account(field_name):
 """Returns the User with the given field_name value.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 email_adress = self.cleaned_data.get(field_name).lower()
 # get the user account for this email
 user_account = users.User(email_adress)
 def clean_user_account_not_in_use(field_name):
 """Check if the field_name value contains an email
 address that hasn't been used for an existing account.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 email_adress = self.cleaned_data.get(field_name).lower()
 # get the user account for this email and check if it's in use
 user_account = users.User(email_adress)
 def clean_url(field_name):
 """Clean method for cleaning a field belonging to a LinkProperty.
 """
+@check_field_is_empty(field_name)
 def wrapped(self):
 value = self.cleaned_data.get(field_name)
 # LinkProperty does not accept the empty string so we must return None
 Raises ValidationError if:
 -Another User has the given email address as account
 -Another User has the given email address in it's FormerAccounts list
 """
 def wrapper(self):
 cleaned_data = self.cleaned_data
 link_id = cleaned_data.get(link_id_field)
 user_account = cleaned_data.get(account_field)
 Raises ValidationError if:
 -A application with this link id and scope path already exists
 -A group with this link id and scope path already exists
 """
 def wrapper(self):
 cleaned_data = self.cleaned_data
 fields = {}

changeset 1287	9b18d612510a
parent 1285	d54f2d80f46e
child 1288	4ef7de6c2b7a