Skip to content

Improve _replace_variable_by_path #550

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
bsuttor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improve _replace_variable_by_path #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d37200
Improve _replace_variable_by_path
bsuttor Apr 22, 2020
0b4df0f
Add changelog
bsuttor Apr 22, 2020
dd4865a
Update tests
bsuttor Apr 22, 2020
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
2 changes: 2 additions & 0 deletions news/550.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix "replace link variable by path" indexer to return an url and not a path.
[bsuttor]
2 changes: 1 addition & 1 deletion plone/app/contenttypes/tests/test_indexes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def test_get_remote_url_in_metadata_variables_replaced(self):
))
self.assertEqual(
brains[0].getRemoteUrl,
'/plone/my-item'
'http://nohost/plone/my-item'
)

def test_getobjsize_image(self):
Expand Down
4 changes: 2 additions & 2 deletions plone/app/contenttypes/tests/test_link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ def test_var_replacement_in_view(self):
)

self.link.remoteUrl = '${portal_url}'
self.assertEqual(view.url(), '/plone')
self.assertEqual(view.url(), 'http://nohost/plone')
self.assertEqual(view.absolute_target_url(), 'http://nohost/plone')

self.link.remoteUrl = '${navigation_root_url}'
self.assertEqual(view.url(), '/plone')
self.assertEqual(view.url(), 'http://nohost/plone')
self.assertEqual(view.absolute_target_url(), 'http://nohost/plone')
2 changes: 1 addition & 1 deletion plone/app/contenttypes/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ def replace_link_variables_by_paths(context, url):


def _replace_variable_by_path(url, variable, obj):
path = '/'.join(obj.getPhysicalPath())
path = obj.absolute_url()
return url.replace(variable, path)