mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	models: Rename Realm.show_digest_email field.
This renames Realm.show_digest_email field to digest_emails_enabled, for greater clarity as to what it does just from seeing the setting name, without having to look it up. Fixes part of #10042.
This commit is contained in:
		@@ -52,7 +52,7 @@ function change_notification_setting(setting, setting_data, status_element) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
exports.set_up = function () {
 | 
			
		||||
    if (!page_params.realm_show_digest_email) {
 | 
			
		||||
    if (!page_params.realm_digest_emails_enabled) {
 | 
			
		||||
        $("#digest_container").hide();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -67,7 +67,7 @@ def enqueue_emails(cutoff: datetime.datetime) -> None:
 | 
			
		||||
    if timezone_now().weekday() != VALID_DIGEST_DAY:
 | 
			
		||||
        return
 | 
			
		||||
 | 
			
		||||
    for realm in Realm.objects.filter(deactivated=False, show_digest_email=True):
 | 
			
		||||
    for realm in Realm.objects.filter(deactivated=False, digest_emails_enabled=True):
 | 
			
		||||
        if not should_process_digest(realm.string_id):
 | 
			
		||||
            continue
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -170,7 +170,7 @@ def fetch_initial_state_data(user_profile: UserProfile,
 | 
			
		||||
        state['realm_uri'] = realm.uri
 | 
			
		||||
        state['realm_available_video_chat_providers'] = realm.VIDEO_CHAT_PROVIDERS
 | 
			
		||||
        state['realm_presence_disabled'] = realm.presence_disabled
 | 
			
		||||
        state['realm_show_digest_email'] = realm.show_digest_email and settings.SEND_DIGEST_EMAILS
 | 
			
		||||
        state['realm_digest_emails_enabled'] = realm.digest_emails_enabled and settings.SEND_DIGEST_EMAILS
 | 
			
		||||
        state['realm_is_zephyr_mirror_realm'] = realm.is_zephyr_mirror_realm
 | 
			
		||||
        state['realm_email_auth_enabled'] = email_auth_enabled(realm)
 | 
			
		||||
        state['realm_password_auth_enabled'] = password_auth_enabled(realm)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								zerver/migrations/0179_rename_to_digest_emails_enabled.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								zerver/migrations/0179_rename_to_digest_emails_enabled.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,20 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
# Generated by Django 1.11.14 on 2018-08-01 10:59
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
from django.db import migrations
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Migration(migrations.Migration):
 | 
			
		||||
 | 
			
		||||
    dependencies = [
 | 
			
		||||
        ('zerver', '0178_rename_to_emails_restricted_to_domains'),
 | 
			
		||||
    ]
 | 
			
		||||
 | 
			
		||||
    operations = [
 | 
			
		||||
        migrations.RenameField(
 | 
			
		||||
            model_name='realm',
 | 
			
		||||
            old_name='show_digest_email',
 | 
			
		||||
            new_name='digest_emails_enabled',
 | 
			
		||||
        ),
 | 
			
		||||
    ]
 | 
			
		||||
@@ -174,7 +174,7 @@ class Realm(models.Model):
 | 
			
		||||
    inline_url_embed_preview = models.BooleanField(default=True)  # type: bool
 | 
			
		||||
 | 
			
		||||
    # Whether digest emails are enabled for the organization.
 | 
			
		||||
    show_digest_email = models.BooleanField(default=True)  # type: bool
 | 
			
		||||
    digest_emails_enabled = models.BooleanField(default=True)  # type: bool
 | 
			
		||||
 | 
			
		||||
    send_welcome_emails = models.BooleanField(default=True)  # type: bool
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -53,7 +53,7 @@ class TestDigestEmailMessages(ZulipTestCase):
 | 
			
		||||
        enqueue_emails(cutoff)
 | 
			
		||||
        self.assertEqual(mock_queue_digest_recipient.call_count, all_user_profiles.count())
 | 
			
		||||
        mock_queue_digest_recipient.reset_mock()
 | 
			
		||||
        for realm in Realm.objects.filter(deactivated=False, show_digest_email=True):
 | 
			
		||||
        for realm in Realm.objects.filter(deactivated=False, digest_emails_enabled=True):
 | 
			
		||||
            user_profiles = all_user_profiles.filter(realm=realm)
 | 
			
		||||
            for user_profile in user_profiles:
 | 
			
		||||
                UserActivity.objects.create(
 | 
			
		||||
@@ -83,7 +83,7 @@ class TestDigestEmailMessages(ZulipTestCase):
 | 
			
		||||
        cutoff = timezone_now()
 | 
			
		||||
        # A Tuesday
 | 
			
		||||
        mock_django_timezone.return_value = datetime.datetime(year=2016, month=1, day=5)
 | 
			
		||||
        realms = Realm.objects.filter(deactivated=False, show_digest_email=True)
 | 
			
		||||
        realms = Realm.objects.filter(deactivated=False, digest_emails_enabled=True)
 | 
			
		||||
        for realm in realms:
 | 
			
		||||
            user_profiles = UserProfile.objects.filter(realm=realm)
 | 
			
		||||
            for counter, user_profile in enumerate(user_profiles, 1):
 | 
			
		||||
 
 | 
			
		||||
@@ -125,6 +125,7 @@ class HomeTest(ZulipTestCase):
 | 
			
		||||
            "realm_default_streams",
 | 
			
		||||
            "realm_default_twenty_four_hour_time",
 | 
			
		||||
            "realm_description",
 | 
			
		||||
            "realm_digest_emails_enabled",
 | 
			
		||||
            "realm_disallow_disposable_email_addresses",
 | 
			
		||||
            "realm_domains",
 | 
			
		||||
            "realm_email_auth_enabled",
 | 
			
		||||
@@ -154,7 +155,6 @@ class HomeTest(ZulipTestCase):
 | 
			
		||||
            "realm_presence_disabled",
 | 
			
		||||
            "realm_push_notifications_enabled",
 | 
			
		||||
            "realm_send_welcome_emails",
 | 
			
		||||
            "realm_show_digest_email",
 | 
			
		||||
            "realm_signup_notifications_stream_id",
 | 
			
		||||
            "realm_uri",
 | 
			
		||||
            "realm_user_groups",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user