diff --git a/hc/accounts/admin.py b/hc/accounts/admin.py index 2713fcbe..1f757214 100644 --- a/hc/accounts/admin.py +++ b/hc/accounts/admin.py @@ -46,7 +46,7 @@ class ProfileAdmin(admin.ModelAdmin): list_display = ("id", "users", "checks", "invited", "reports_allowed", "ping_log_limit", "sms") search_fields = ["id", "user__email"] - list_filter = ("team_access_allowed", "team_limit", "reports_allowed", + list_filter = ("team_limit", "reports_allowed", "check_limit", "next_report_date") fieldsets = (ProfileFieldset.tuple(), TeamFieldset.tuple()) diff --git a/hc/accounts/migrations/0013_remove_profile_team_access_allowed.py b/hc/accounts/migrations/0013_remove_profile_team_access_allowed.py new file mode 100644 index 00000000..9915269a --- /dev/null +++ b/hc/accounts/migrations/0013_remove_profile_team_access_allowed.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-10-14 16:15 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0012_auto_20171014_1002'), + ] + + operations = [ + migrations.RemoveField( + model_name='profile', + name='team_access_allowed', + ), + ] diff --git a/hc/accounts/models.py b/hc/accounts/models.py index f50de424..f07235b9 100644 --- a/hc/accounts/models.py +++ b/hc/accounts/models.py @@ -44,7 +44,6 @@ class Profile(models.Model): # Owner: user = models.OneToOneField(User, models.CASCADE, blank=True, null=True) team_name = models.CharField(max_length=200, blank=True) - team_access_allowed = models.BooleanField(default=False) next_report_date = models.DateTimeField(null=True, blank=True) reports_allowed = models.BooleanField(default=True) nag_period = models.DurationField(default=NO_NAG, choices=NAG_PERIODS) diff --git a/hc/payments/views.py b/hc/payments/views.py index 8c936fc2..5ae0f97e 100644 --- a/hc/payments/views.py +++ b/hc/payments/views.py @@ -113,7 +113,6 @@ def create_plan(request): profile.team_limit = 9 profile.sms_limit = 50 profile.sms_sent = 0 - profile.team_access_allowed = True profile.save() elif plan_id == "P50": profile.ping_log_limit = 1000 @@ -121,7 +120,6 @@ def create_plan(request): profile.team_limit = 500 profile.sms_limit = 500 profile.sms_sent = 0 - profile.team_access_allowed = True profile.save() request.session["first_charge"] = True @@ -173,7 +171,6 @@ def cancel_plan(request): profile.check_limit = 20 profile.team_limit = 2 profile.sms_limit = 0 - profile.team_access_allowed = False profile.save() return redirect("hc-pricing")