Skip to content

Commit

Permalink
Merge pull request #681 from edx/ammar/ENT-2539
Browse files Browse the repository at this point in the history
add boolean field to track linked/unlinked EnterpriseCustomerUser
  • Loading branch information
muhammad-ammar authored Jan 24, 2020
2 parents 67b811a + 1122367 commit 7123cae
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ Change Log

.. There should always be an "Unreleased" section for changes pending release.
[2.1.4] - 2020-01-24
---------------------

* add boolean field to track linked/unlinked EnterpriseCustomerUser records

[2.1.03] - 2020-01-24
---------------------

Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

from __future__ import absolute_import, unicode_literals

__version__ = "2.1.03"
__version__ = "2.1.4"

default_app_config = "enterprise.apps.EnterpriseConfig" # pylint: disable=invalid-name
20 changes: 20 additions & 0 deletions enterprise/migrations/0085_enterprisecustomeruser_linked.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.24 on 2020-01-24 12:20
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('enterprise', '0084_auto_20200120_1137'),
]

operations = [
migrations.AddField(
model_name='enterprisecustomeruser',
name='linked',
field=models.BooleanField(default=True),
),
]
1 change: 1 addition & 0 deletions enterprise/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@ class EnterpriseCustomerUser(TimeStampedModel):
)
user_id = models.PositiveIntegerField(null=False, blank=False, db_index=True)
active = models.BooleanField(default=True)
linked = models.BooleanField(default=True)

objects = EnterpriseCustomerUserManager()

Expand Down
1 change: 1 addition & 0 deletions tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def setUp(self):
"enterprise_customer",
"user_id",
"active",
"linked",
]
),
(
Expand Down

0 comments on commit 7123cae

Please sign in to comment.