paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

zerver/lib/actions.py: Remove unneeded return {} statements.

Browse Source
This commit is contained in:
Eklavya Sharma
2016-05-26 17:32:37 +05:30
committed by Tim Abbott
parent a2b48f05e5
commit efab224bd1
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/lib/actions.py
View File

@@ -331,7 +331,6 @@ def do_set_realm_name(realm, name):
value=name, value=name,
) )
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return {}
def do_set_realm_restricted_to_domain(realm, restricted): def do_set_realm_restricted_to_domain(realm, restricted):
realm.restricted_to_domain = restricted realm.restricted_to_domain = restricted
@@ -343,7 +342,6 @@ def do_set_realm_restricted_to_domain(realm, restricted):
value=restricted, value=restricted,
) )
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return {}
def do_set_realm_invite_required(realm, invite_required): def do_set_realm_invite_required(realm, invite_required):
realm.invite_required = invite_required realm.invite_required = invite_required
@@ -355,7 +353,6 @@ def do_set_realm_invite_required(realm, invite_required):
value=invite_required, value=invite_required,
) )
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return {}
def do_set_realm_invite_by_admins_only(realm, invite_by_admins_only): def do_set_realm_invite_by_admins_only(realm, invite_by_admins_only):
realm.invite_by_admins_only = invite_by_admins_only realm.invite_by_admins_only = invite_by_admins_only
@@ -367,7 +364,6 @@ def do_set_realm_invite_by_admins_only(realm, invite_by_admins_only):
value=invite_by_admins_only, value=invite_by_admins_only,
) )
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return {}
def do_set_realm_create_stream_by_admins_only(realm, create_stream_by_admins_only): def do_set_realm_create_stream_by_admins_only(realm, create_stream_by_admins_only):
realm.create_stream_by_admins_only = create_stream_by_admins_only realm.create_stream_by_admins_only = create_stream_by_admins_only
@@ -379,7 +375,6 @@ def do_set_realm_create_stream_by_admins_only(realm, create_stream_by_admins_onl
value=create_stream_by_admins_only, value=create_stream_by_admins_only,
) )
send_event(event, active_user_ids(realm)) send_event(event, active_user_ids(realm))
return {}
def do_deactivate_realm(realm): def do_deactivate_realm(realm):
""" """
@@ -1644,7 +1639,6 @@ def do_make_stream_public(user_profile, realm, stream_name):
stream.invite_only = False stream.invite_only = False
stream.save(update_fields=['invite_only']) stream.save(update_fields=['invite_only'])
return {}
def do_make_stream_private(realm, stream_name): def do_make_stream_private(realm, stream_name):
stream_name = stream_name.strip() stream_name = stream_name.strip()
@@ -1655,7 +1649,6 @@ def do_make_stream_private(realm, stream_name):
stream.invite_only = True stream.invite_only = True
stream.save(update_fields=['invite_only']) stream.save(update_fields=['invite_only'])
return {}
def do_rename_stream(realm, old_name, new_name, log=True): def do_rename_stream(realm, old_name, new_name, log=True):
old_name = old_name.strip() old_name = old_name.strip()
@@ -1738,7 +1731,6 @@ def do_change_stream_description(realm, stream_name, new_description):
property='description', name=stream_name, property='description', name=stream_name,
value=new_description) value=new_description)
send_event(event, stream_user_ids(stream)) send_event(event, stream_user_ids(stream))
return {}
def do_create_realm(domain, name, restricted_to_domain=True): def do_create_realm(domain, name, restricted_to_domain=True):
realm = get_realm(domain) realm = get_realm(domain)
@@ -1915,17 +1907,14 @@ def set_default_streams(realm, stream_names):
def do_add_default_stream(realm, stream_name): def do_add_default_stream(realm, stream_name):
stream, _ = create_stream_if_needed(realm, stream_name) stream, _ = create_stream_if_needed(realm, stream_name)
if DefaultStream.objects.filter(realm=realm, stream=stream).exists(): if not DefaultStream.objects.filter(realm=realm, stream=stream).exists():
return {} DefaultStream.objects.create(realm=realm, stream=stream)
DefaultStream.objects.create(realm=realm, stream=stream)
return {}
def do_remove_default_stream(realm, stream_name): def do_remove_default_stream(realm, stream_name):
stream = get_stream(stream_name, realm) stream = get_stream(stream_name, realm)
if stream is None: if stream is None:
raise JsonableError("Stream does not exist") raise JsonableError("Stream does not exist")
DefaultStream.objects.filter(realm=realm, stream=stream).delete() DefaultStream.objects.filter(realm=realm, stream=stream).delete()
return {}
def get_default_streams_for_realm(realm): def get_default_streams_for_realm(realm):
return [default.stream for default in return [default.stream for default in

15
zerver/views/streams.py
View File

@@ -124,30 +124,35 @@ def deactivate_stream_backend(request, user_profile, stream_name):
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def add_default_stream(request, user_profile, stream_name=REQ): def add_default_stream(request, user_profile, stream_name=REQ):
return json_success(do_add_default_stream(user_profile.realm, stream_name)) do_add_default_stream(user_profile.realm, stream_name)
return json_success()
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def remove_default_stream(request, user_profile, stream_name=REQ): def remove_default_stream(request, user_profile, stream_name=REQ):
return json_success(do_remove_default_stream(user_profile.realm, stream_name)) do_remove_default_stream(user_profile.realm, stream_name)
return json_success()
@authenticated_json_post_view @authenticated_json_post_view
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def json_rename_stream(request, user_profile, old_name=REQ, new_name=REQ): def json_rename_stream(request, user_profile, old_name=REQ, new_name=REQ):
return json_success(do_rename_stream(user_profile.realm, old_name, new_name)) do_rename_stream(user_profile.realm, old_name, new_name)
return json_success()
@authenticated_json_post_view @authenticated_json_post_view
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def json_make_stream_public(request, user_profile, stream_name=REQ): def json_make_stream_public(request, user_profile, stream_name=REQ):
return json_success(do_make_stream_public(user_profile, user_profile.realm, stream_name)) do_make_stream_public(user_profile, user_profile.realm, stream_name)
return json_success()
@authenticated_json_post_view @authenticated_json_post_view
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def json_make_stream_private(request, user_profile, stream_name=REQ): def json_make_stream_private(request, user_profile, stream_name=REQ):
return json_success(do_make_stream_private(user_profile.realm, stream_name)) do_make_stream_private(user_profile.realm, stream_name)
return json_success()
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables