Merge pull request #19258 from edx/revert/paulo/anonymous-views

Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"

cms/djangoapps/models/settings/course_metadata.py

@@ -9,8 +9,6 @@ from xblock.fields import Scope
 from xblock_django.models import XBlockStudioConfigurationFlag
 from xmodule.modulestore.django import modulestore
 
-from openedx.features.course_experience import COURSE_ENABLE_UNENROLLED_ACCESS_FLAG
-
 
 class CourseMetadata(object):
     '''
@@ -65,7 +63,7 @@ class CourseMetadata(object):
     ]
 
     @classmethod
-    def filtered_list(cls, course_key=None):
+    def filtered_list(cls):
         """
         Filter fields based on feature flag, i.e. enabled, disabled.
         """
@@ -119,10 +117,6 @@ class CourseMetadata(object):
         if not XBlockStudioConfigurationFlag.is_enabled():
             filtered_list.append('allow_unsupported_xblocks')
 
-        # Do not show "Course Visibility For Unenrolled Learners" in Studio Advanced Settings
-        # if the enable_anonymous_access flag is not enabled
-        if not COURSE_ENABLE_UNENROLLED_ACCESS_FLAG.is_enabled(course_key=course_key):
-            filtered_list.append('course_visibility')
         return filtered_list
 
     @classmethod
@@ -134,7 +128,7 @@ class CourseMetadata(object):
         result = {}
         metadata = cls.fetch_all(descriptor)
         for key, value in metadata.iteritems():
-            if key in cls.filtered_list(descriptor.id):
+            if key in cls.filtered_list():
                 continue
             result[key] = value
         return result
@@ -169,7 +163,7 @@ class CourseMetadata(object):
 
         Ensures none of the fields are in the blacklist.
         """
-        filtered_list = cls.filtered_list(descriptor.id)
+        filtered_list = cls.filtered_list()
         # Don't filter on the tab attribute if filter_tabs is False.
         if not filter_tabs:
             filtered_list.remove("tabs")
@@ -205,7 +199,7 @@ class CourseMetadata(object):
             errors: list of error objects
             result: the updated course metadata or None if error
         """
-        filtered_list = cls.filtered_list(descriptor.id)
+        filtered_list = cls.filtered_list()
         if not filter_tabs:
             filtered_list.remove("tabs")