CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

custom fields: Replace field id with field name in error message.

Browse Source
This commit is contained in:
Yashashvi Dave 2018-04-29 14:58:33 +05:30 committed by Tim Abbott
parent 0d7d94d0db
commit a97a00a4c6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/tests/test_custom_profile_data.py
View File

@ -251,7 +251,7 @@ class CustomProfileDataTest(ZulipTestCase):
})
self.assert_json_error(
result,
u"value[{}] is too long (limit: 50 characters).".format(field.id))
u"{} is too long (limit: 50 characters).".format(field.name))
def test_update_invalid_date(self) -> None:
self.login(self.example_email("iago"))
@ -261,10 +261,10 @@ class CustomProfileDataTest(ZulipTestCase):
# Update value of field
result = self.client_patch("/json/users/me/profile_data",
{'data': ujson.dumps([{"id": field.id, "value": u"a-b-c"}])})
self.assert_json_error(result, u"value[{}] is not a date".format(field.id))
self.assert_json_error(result, u"{} is not a date".format(field.name))
result = self.client_patch("/json/users/me/profile_data",
{'data': ujson.dumps([{"id": field.id, "value": 123}])})
self.assert_json_error(result, u"value[{}] is not a string".format(field.id))
self.assert_json_error(result, u"{} is not a string".format(field.name))
def test_update_invalid_url(self) -> None:
self.login(self.example_email("iago"))
@ -276,7 +276,7 @@ class CustomProfileDataTest(ZulipTestCase):
{'data': ujson.dumps([{"id": field.id, "value": u"abc"}])})
self.assert_json_error(
result,
u"value[{}] is not a URL".format(field.id))
u"{} is not a URL".format(field.name))
def test_update_profile_data(self) -> None:
self.login(self.example_email("iago"))
@ -341,7 +341,7 @@ class CustomProfileDataTest(ZulipTestCase):
result = self.client_patch("/json/users/me/profile_data",
{'data': ujson.dumps(data)})
self.assert_json_error(result,
"'foobar' is not a valid choice for 'value[4]'.")
"'foobar' is not a valid choice for '{}'.".format(field.name))
data = [{
'id': field.id,

3
zerver/views/custom_profile_fields.py
View File

@ -125,15 +125,14 @@ def update_user_custom_profile_data(
extended_validators = CustomProfileField.EXTENDED_FIELD_VALIDATORS
field_type = field.field_type
value = item['value']
var_name = '{}'.format(field.name)
if field_type in validators:
validator = validators[field_type]
var_name = 'value[{}]'.format(field_id)
result = validator(var_name, value)
else:
# Check extended validators.
extended_validator = extended_validators[field_type]
field_data = field.field_data
var_name = 'value[{}]'.format(field_id)
result = extended_validator(var_name, field_data, value)
if result is not None: