Merge branch 'master' of github.com:openedx/edx-enterprise into hamza…

…/ENT-8276-record-corner-stone-api-calls
openedx · Jan 29, 2024 · a161565 · a161565
2 parents 317e4ee + 37cc96b
commit a161565
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,11 +16,21 @@ Change Log
 Unreleased
 ----------
 
-[4.11.0]
---------
+[4.10.12]
+---------
 
 feat: update cornerstone client to store API calls in DB
 
+[4.10.11]
+---------
+* fix: add missing comma to catalog query fields list.
+
+[4.10.10]
+---------
+
+feat: remove ability to edit catalog `include_exec_ed_2u_courses`
+
+
 [4.10.9]
 --------
 

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.11.0"
+__version__ = "4.10.12"
diff --git a/enterprise/admin/__init__.py b/enterprise/admin/__init__.py
@@ -810,6 +810,13 @@ class EnterpriseCatalogQueryAdmin(admin.ModelAdmin):
     class Meta:
         model = models.EnterpriseCatalogQuery
 
+    fields = (
+        'uuid',
+        'title',
+        'discovery_query_url',
+        'content_filter',
+    )
+
     def get_urls(self):
         """
         Returns the additional urls used by the custom object tools.
@@ -826,7 +833,6 @@ def get_urls(self):
     list_display = (
         'title',
         'discovery_query_url',
-        'include_exec_ed_2u_courses',
     )
 
     @admin.display(