Skip to content

Commit

Permalink
Merge pull request #2200 from openedx/mkeating/migration-0219
Browse files Browse the repository at this point in the history
fix: add missing migration for content_filter help text
  • Loading branch information
marlonkeating committed Aug 8, 2024
2 parents 27f4a64 + 4726180 commit 995002f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Unreleased
----------
* nothing unreleased

[4.23.3]
---------
* fix: add missing migration for content_filter help text

[4.23.2]
---------
* test: pii check stage actually checks PII instead of not at all.
Expand Down
6 changes: 3 additions & 3 deletions docs/decisions/0014-enterprise-catalog-sync-catalogs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We would like to have a way to reuse a saved set of courses configured by a quer
Decisions
=========

- **Sync catalog/customer data with enterprise-catalog**
**Sync catalog/customer data with enterprise-catalog**
As the catalog data is saved in both edx-enterprise and enterprise-catalog, we need to make sure that catalog data is consistent across both.
In the context of edx-enterprise, changes to EnterpriseCatalogQuery and EnterpriseCustomerCatalog will be propagated to their counterparts
in the enterprise-catalog service.
Expand All @@ -23,7 +23,7 @@ in the enterprise-catalog service.
Consequences
============

- **EnterpriseCatalogQuery Sync Process**
**EnterpriseCatalogQuery Sync Process**
The enterprise-catalog service enforces a uniqueness constraint for the `content_filter` field, and so edx-enterprise must enforce it as well
or the sync operation will fail and the entities will be out of sync with each other.

Expand All @@ -35,7 +35,7 @@ them to enterprise-catalog.
If the `content_filter` is *not* unique, we display an error on the EnterpriseCatalogQuery edit page and don't commit the change.


- **EnterpriseCustomerCatalog Sync Process**
**EnterpriseCustomerCatalog Sync Process**
In the Django Admin console, whenever a EnterpriseCustomerCatalog is created, or an existing one is edited, we simply pass the changes on to
enterprise-catalog without doing any checks for duplicates.

Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Your project description goes here.
"""

__version__ = "4.23.2"
__version__ = "4.23.3"
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 4.2.15 on 2024-08-08 17:29

import collections
from django.db import migrations
import enterprise.validators
import jsonfield.encoder
import jsonfield.fields


class Migration(migrations.Migration):

dependencies = [
('enterprise', '0218_add_provisioning_admin_role'),
]

operations = [
migrations.AlterField(
model_name='enterprisecatalogquery',
name='content_filter',
field=jsonfield.fields.JSONField(blank=True, default={}, dump_kwargs={'cls': jsonfield.encoder.JSONEncoder, 'indent': 4, 'separators': (',', ':')}, help_text="Query parameters which will be used to filter the discovery service's search/all endpoint results, specified as a JSON object. An empty JSON object means that all available content items will be included in the catalog. Must be unique.", load_kwargs={'object_pairs_hook': collections.OrderedDict}, null=True, validators=[enterprise.validators.validate_content_filter_fields]),
),
]

0 comments on commit 995002f

Please sign in to comment.