Skip to content

XLoader Relative URIs & Language Domain Plugin Support #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JVickery-TBS wants to merge 10 commits into
base: canada-v2.10
Choose a base branch
from
Open

XLoader Relative URIs & Language Domain Plugin Support #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5de6b4b
feat(dev): xloader relative uris;
JVickery-TBS Jun 8, 2026
5601f3f
feat(misc): changelog;
JVickery-TBS Jun 8, 2026
ad98f5b
feat(logic): lang domain support;
JVickery-TBS Jun 8, 2026
80ee953
stash
JVickery-TBS Jun 15, 2026
0e9ae8c
stash
JVickery-TBS Jun 16, 2026
faf70ca
stash
JVickery-TBS Jun 16, 2026
1f476f3
stash
JVickery-TBS Jun 16, 2026
ac37126
stash
JVickery-TBS Jun 16, 2026
f4234e7
stash
JVickery-TBS Jun 16, 2026
b31d8ba
stash
JVickery-TBS Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/229.canada.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prepends the requesting host and scheme to the `original_url` XLoader Resource field, supporting relative URIs for XLoader fields in the database.
10 changes: 5 additions & 5 deletions ckan/logic/action/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from flask import request
from urllib.parse import urlparse, urlunparse


import ckan
import ckan.lib.dictization
import ckan.logic as logic
Expand Down Expand Up @@ -1149,11 +1148,12 @@ def package_show(context: Context, data_dict: DataDict) -> ActionResult.PackageS
scheme=configured_parts.scheme)
current_domain = urlunparse(requesting_parts)
for res_dict in package_dict['resources']:
if(
res_dict.get('url_type') == 'upload' and
res_dict.get('url', '').startswith('/')
):
if res_dict.get('url_type') != 'upload':
continue
if res_dict.get('url', '').startswith('/'):
res_dict['url'] = current_domain + res_dict['url']
if res_dict.get('original_url', '').startswith('/'):
res_dict['original_url'] = current_domain + res_dict['original_url'] # XLoader field

return package_dict

Expand Down
Loading