draft

git-hyagi · Jan 14, 2025 · b871c7b · b871c7b
1 parent 421a917
commit b871c7b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/pulpcore/app/serializers/fields.py b/pulpcore/app/serializers/fields.py
@@ -311,10 +311,9 @@ class BaseURLField(serializers.CharField):
     """
 
     def to_representation(self, value):
-        if not settings.CONTENT_ORIGIN:
-            origin = 'https://pulp/'
-            #origin = 'http://localhost:5001/'
-        else:
+        #origin = 'https://pulp/'
+        origin = '/'
+        if settings.CONTENT_ORIGIN:
             origin = settings.CONTENT_ORIGIN.strip("/")
         prefix = settings.CONTENT_PATH_PREFIX.strip("/")
         base_path = value.base_path.strip("/")

diff --git a/pulpcore/pytest_plugin.py b/pulpcore/pytest_plugin.py
@@ -777,7 +777,6 @@ def pulp_content_url(pulp_settings, pulp_domain_enabled):
     url = f"{pulp_settings.CONTENT_ORIGIN}{pulp_settings.CONTENT_PATH_PREFIX}"
     if not pulp_settings.CONTENT_ORIGIN:
         url = f"https://pulp{pulp_settings.CONTENT_PATH_PREFIX}"
-        #url = f"http://localhost:5001{pulp_settings.CONTENT_PATH_PREFIX}"
 
     if pulp_domain_enabled:
         url += "default/"

diff --git a/pulpcore/tests/functional/api/using_plugin/test_content_path.py b/pulpcore/tests/functional/api/using_plugin/test_content_path.py
@@ -38,7 +38,6 @@ def test_content_directory_listing(
     content_origin = pulp_status.content_settings.content_origin
     if not content_origin:
         content_origin = "https://pulp"
-        #content_origin = "http://localhost:5001"
     base_url = urljoin(
         content_origin,
         pulp_status.content_settings.content_path_prefix,