Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Realm.py: Removing 'exclude' variable. 

The exclude variable was superfluous. The realm properties
listed in the exclude variable are not in the
realm.property_types dict, so they do not need to
be explicitly excluded.
This commit is contained in:
Sarah 2017-04-19 03:49:53 +00:00 committed by Tim Abbott
parent 95ff65b290
commit 81f76ff13b
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/views/realm.py
View File

@ -59,19 +59,8 @@ def update_realm(request, user_profile, name=REQ(validator=check_string, default
req_vars = {k: v for k, v in list(locals().items()) if k in realm.property_types} req_vars = {k: v for k, v in list(locals().items()) if k in realm.property_types}
data = {} # type: Dict[str, Any] data = {} # type: Dict[str, Any]
# list of realm properties that should be handled differently
exclude = [
# authentication_methods is not supported by the
# do_set_realm_property framework because of its bitfield.
'authentication_methods',
# The message_editing settings are coupled to each other, and
# thus don't fit into the do_set_realm_property framework.
'allow_message_editing',
'message_content_edit_limit_seconds',
] # type: List[str]
for k, v in list(req_vars.items()): for k, v in list(req_vars.items()):
if v is not None and getattr(realm, k) != v and k not in exclude: if v is not None and getattr(realm, k) != v:
do_set_realm_property(realm, k, v) do_set_realm_property(realm, k, v)
if isinstance(v, Text): if isinstance(v, Text):
data[k] = 'updated' data[k] = 'updated'
@ -79,9 +68,13 @@ def update_realm(request, user_profile, name=REQ(validator=check_string, default
data[k] = v data[k] = v
# The following realm properties do not fit the pattern above # The following realm properties do not fit the pattern above
# authentication_methods is not supported by the do_set_realm_property
# framework because of its bitfield.
if authentication_methods is not None and realm.authentication_methods_dict() != authentication_methods: if authentication_methods is not None and realm.authentication_methods_dict() != authentication_methods:
do_set_realm_authentication_methods(realm, authentication_methods) do_set_realm_authentication_methods(realm, authentication_methods)
data['authentication_methods'] = authentication_methods data['authentication_methods'] = authentication_methods
# The message_editing settings are coupled to each other, and thus don't fit
# into the do_set_realm_property framework.
if (allow_message_editing is not None and realm.allow_message_editing != allow_message_editing) or \ if (allow_message_editing is not None and realm.allow_message_editing != allow_message_editing) or \
(message_content_edit_limit_seconds is not None and (message_content_edit_limit_seconds is not None and
realm.message_content_edit_limit_seconds != message_content_edit_limit_seconds): realm.message_content_edit_limit_seconds != message_content_edit_limit_seconds):