paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out the check for whether name changes are disabled

Browse Source 
(imported from commit 56ddd9cf53ec49e2e096abe82ed44f758912272e)
This commit is contained in:
Zev Benjamin
2014-03-27 18:50:37 -04:00
parent 8518801601
commit 9114715030
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/settings.js
View File

@@ -444,16 +444,7 @@ exports.setup_page = function () {
avatar.build_user_avatar_widget(upload_avatar);
if (page_params.domain === "users.customer4.invalid" ||
page_params.name_changes_disabled) {
// At the request of the facilitators, CUSTOMER4 users
// can't change their names, so don't show that as a settings
// option. This is also disabled through the JSON UI. Once we
// have the infrastructure for administrative policies, we can
// handle this more gracefully.
//
// Additionally, if this install has disabled name changes, hide the
// container
if (page_params.name_changes_disabled) {
$("#name_change_container").hide();
}

22
zerver/views/__init__.py
View File

@@ -202,6 +202,10 @@ def principal_to_user_profile(agent, principal):
return principal_user_profile
def name_changes_disabled(realm):
return (settings.NAME_CHANGES_DISABLED
or realm.domain in ('users.customer4.invalid'))
@require_post
@has_request_variables
def beta_signup_submission(request, name=REQ, email=REQ,
@@ -322,7 +326,7 @@ def accounts_register(request):
form = RegistrationForm()
else:
postdata = request.POST.copy()
if settings.NAME_CHANGES_DISABLED:
if name_changes_disabled(realm):
# If we populate profile information via LDAP and we have a
# verified name from you on file, use that. Otherwise, fall
# back to the full name in the request.
@@ -376,7 +380,7 @@ def accounts_register(request):
'email': email,
'key': key,
'full_name': request.session.get('authenticated_full_name', None),
'lock_name': name_validated and settings.NAME_CHANGES_DISABLED
'lock_name': name_validated and name_changes_disabled(realm)
},
context_instance=RequestContext(request))
@@ -914,7 +918,7 @@ def home(request):
is_admin = user_profile.is_admin(),
can_create_streams = user_profile.can_create_streams(),
notify_for_streams_by_default = notify_for_streams_by_default(user_profile),
name_changes_disabled = settings.NAME_CHANGES_DISABLED,
name_changes_disabled = name_changes_disabled(user_profile.realm),
has_mobile_devices = num_push_devices_for_user(user_profile) > 0,
autoscroll_forever = user_profile.autoscroll_forever,
show_autoscroll_forever_option = user_profile.realm.domain in ("customer28.invalid", "zulip.com", "customer31.invalid"),
@@ -1414,15 +1418,9 @@ def json_change_settings(request, user_profile,
result = {}
if user_profile.full_name != full_name and full_name.strip() != "":
if settings.NAME_CHANGES_DISABLED or \
user_profile.realm.domain == "users.customer4.invalid":
# At the request of the facilitators, CUSTOMER4
# students can't change their names. Failingly silently is
# fine -- they can't do it through the UI, so they'd have
# to be trying to break the rules.
#
# Additionally, if this install has disabled name changes altogether,
# ignore name changes as well
if name_changes_disabled(user_profile.realm.domain):
# Failingly silently is fine -- they can't do it through the UI, so
# they'd have to be trying to break the rules.
pass
else:
new_full_name = full_name.strip()