From 0b4cbc6885bc66a4bb96cff5126b5302144ff629 Mon Sep 17 00:00:00 2001 From: Valmik Jangla Date: Mon, 18 Jul 2016 23:36:17 -0700 Subject: [PATCH] Added email group to limit commands --- frappe/commands/site.py | 10 +++++----- frappe/email/doctype/email_group/email_group.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index ab06fa60b7..a77b9919c4 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -376,8 +376,8 @@ def _set_limits(context, site, limits): with frappe.init_site(site): new_limits = {} for limit, value in limits: - if limit not in ('emails', 'space', 'users', 'expiry', - 'support_email', 'support_chat', 'upgrade_url'): + if limit not in ('emails', 'space', 'users', 'email_group', + 'expiry', 'support_email', 'support_chat', 'upgrade_url'): frappe.throw('Invalid limit {0}'.format(limit)) if limit=='expiry': @@ -389,7 +389,7 @@ def _set_limits(context, site, limits): elif limit=='space': value = float(value) - elif limit in ('users', 'emails'): + elif limit in ('users', 'emails', 'email_group'): value = int(value) new_limits[limit] = value @@ -398,8 +398,8 @@ def _set_limits(context, site, limits): @click.command('clear-limits') @click.option('--site', help='site name') -@click.argument('limits', nargs=-1, type=click.Choice(['emails', 'space', 'users', 'expiry', - 'support_email', 'support_chat', 'upgrade_url'])) +@click.argument('limits', nargs=-1, type=click.Choice(['emails', 'space', 'users', 'email_group', + 'expiry', 'support_email', 'support_chat', 'upgrade_url'])) @pass_context def clear_limits(context, site, limits): """Clears given limit from the site config, and removes limit from site config if its empty""" diff --git a/frappe/email/doctype/email_group/email_group.py b/frappe/email/doctype/email_group/email_group.py index 20daedb8d3..734e49da55 100755 --- a/frappe/email/doctype/email_group/email_group.py +++ b/frappe/email/doctype/email_group/email_group.py @@ -93,7 +93,7 @@ def add_subscribers(name, email_list): def restrict_email_group(doc, method): from frappe.limits import get_limits - email_group_limit = get_limits().get('email_group_limit') + email_group_limit = get_limits().get('email_group') if not email_group_limit: return