paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

custom profile fields: Extract function validate_custom_field_data.

Browse Source
This commit is contained in:
Yashashvi Dave
2019-06-07 11:30:37 +05:30
committed by Tim Abbott
parent e7b9b93f84
commit 0b4384f4cd
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
zerver/views/custom_profile_fields.py
View File

@@ -42,6 +42,19 @@ def validate_field_name_and_hint(name: str, hint: str) -> None:
if error: if error:
raise JsonableError(error) raise JsonableError(error)
def validate_custom_field_data(field_type: int,
field_data: ProfileFieldData) -> None:
error = None
if field_type == CustomProfileField.CHOICE:
# Choice type field must have at least have one choice
if len(field_data) < 1:
raise JsonableError(_("Field must have at least one choice."))
error = validate_choice_field_data(field_data)
if error:
raise JsonableError(error)
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def create_realm_custom_profile_field(request: HttpRequest, def create_realm_custom_profile_field(request: HttpRequest,
@@ -56,14 +69,7 @@ def create_realm_custom_profile_field(request: HttpRequest,
if field_type not in field_types: if field_type not in field_types:
return json_error(_("Invalid field type.")) return json_error(_("Invalid field type."))
# Choice type field must have at least have one choice validate_custom_field_data(field_type, field_data)
if field_type == CustomProfileField.CHOICE and len(field_data) < 1:
return json_error(_("Field must have at least one choice."))
error = validate_choice_field_data(field_data)
if error:
return json_error(error)
try: try:
field = try_add_realm_custom_profile_field( field = try_add_realm_custom_profile_field(
realm=user_profile.realm, realm=user_profile.realm,
@@ -98,9 +104,6 @@ def update_realm_custom_profile_field(request: HttpRequest, user_profile: UserPr
converter=ujson.loads), converter=ujson.loads),
) -> HttpResponse: ) -> HttpResponse:
validate_field_name_and_hint(name, hint) validate_field_name_and_hint(name, hint)
error = validate_choice_field_data(field_data)
if error:
return json_error(error)
realm = user_profile.realm realm = user_profile.realm
try: try:
@@ -108,6 +111,7 @@ def update_realm_custom_profile_field(request: HttpRequest, user_profile: UserPr
except CustomProfileField.DoesNotExist: except CustomProfileField.DoesNotExist:
return json_error(_('Field id {id} not found.').format(id=field_id)) return json_error(_('Field id {id} not found.').format(id=field_id))
validate_custom_field_data(field.field_type, field_data)
try: try:
try_update_realm_custom_profile_field(realm, field, name, hint=hint, try_update_realm_custom_profile_field(realm, field, name, hint=hint,
field_data=field_data) field_data=field_data)