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

settings: Remove unused setting ACCOUNT_ACTIVATION_DAYS. 

ACCOUNT_ACTIVATION_DAYS doesn't seems to be used anywhere.
INVITATION_LINK_VALIDITY_DAYS seems to do it's job currently.

(It was only ever used in very early Zulip commits).
This commit is contained in:
Vishnu Ks 2018-02-21 22:51:50 +05:30 committed by Tim Abbott
parent 0c0aec3cc9
commit 410e2574d1
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@ -4887,7 +4887,7 @@ def do_invite_users(user_profile: UserProfile,
notify_invites_changed(user_profile) notify_invites_changed(user_profile)
def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]: def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
days_to_activate = getattr(settings, 'ACCOUNT_ACTIVATION_DAYS', 7) days_to_activate = settings.INVITATION_LINK_VALIDITY_DAYS
active_value = getattr(confirmation_settings, 'STATUS_ACTIVE', 1) active_value = getattr(confirmation_settings, 'STATUS_ACTIVE', 1)
lowest_datetime = timezone_now() - datetime.timedelta(days=days_to_activate) lowest_datetime = timezone_now() - datetime.timedelta(days=days_to_activate)

2
zerver/tests/test_signup.py
View File

@ -1255,7 +1255,7 @@ class InvitationsTestCase(InviteUserBase):
A GET call to /json/invites returns all unexpired invitations. A GET call to /json/invites returns all unexpired invitations.
""" """
days_to_activate = getattr(settings, 'ACCOUNT_ACTIVATION_DAYS', "Wrong") days_to_activate = getattr(settings, 'INVITATION_LINK_VALIDITY_DAYS', "Wrong")
active_value = getattr(confirmation_settings, 'STATUS_ACTIVE', "Wrong") active_value = getattr(confirmation_settings, 'STATUS_ACTIVE', "Wrong")
self.assertNotEqual(days_to_activate, "Wrong") self.assertNotEqual(days_to_activate, "Wrong")
self.assertNotEqual(active_value, "Wrong") self.assertNotEqual(active_value, "Wrong")

2
zproject/settings.py
View File

@ -1267,8 +1267,6 @@ LOGGING = {
} }
} }
ACCOUNT_ACTIVATION_DAYS = 7
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
# Client-side polling timeout for get_events, in milliseconds. # Client-side polling timeout for get_events, in milliseconds.