Skip to content
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.

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

Move the apihelp to the static folder and move the static folder to t… #5098

Merged
merged 1 commit into from
Jun 27, 2019

Conversation

sbrunner
Copy link
Member

…he config

@sbrunner sbrunner added this to the 2.5 milestone Jun 27, 2019
@camptocamp camptocamp deleted a comment Jun 27, 2019
@sbrunner sbrunner force-pushed the move-apihelp branch 2 times, most recently from 185d8ef to e31bd8b Compare June 27, 2019 10:49
@camptocamp camptocamp deleted a comment Jun 27, 2019
@sbrunner sbrunner force-pushed the move-apihelp branch 4 times, most recently from 07f543c to 465bb55 Compare June 27, 2019 13:03
@sbrunner sbrunner requested a review from fredj June 27, 2019 13:37
@sbrunner sbrunner marked this pull request as ready for review June 27, 2019 13:42
@@ -54,7 +54,7 @@ def static_url(path, **kwargs):
request.static_url = static_url

self.assertEqual(get_url2("test", "static://pr:st/icon.png", request, set()), "http://server.org/pr:st/icon.png")
self.assertEqual(get_url2("test", "static:///icon.png", request, set()), "http://server.org/my_project_geoportal:static/icon.png")
self.assertEqual(get_url2("test", "static:///icon.png", request, set()), "http://server.org//etc/geomapfish/static/icon.png")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.assertEqual(get_url2("test", "static:///icon.png", request, set()), "http://server.org//etc/geomapfish/static/icon.png")
self.assertEqual(get_url2("test", "static:///icon.png", request, set()), "http://server.org/etc/geomapfish/static/icon.png")

double slash in the url ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just an artifact of the tests...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be like that or also changing the get static URL method ...

@@ -239,7 +239,7 @@ def static_url(url, **kwargs):
"time": "10:36:28",
"datetime": "2003-09-25T10:36:28",
"url1": "http://example.com/hi?a=b#c",
"url2": "http://dummy.org/tests_geoportal:static/path/icon.png",
"url2": "http://dummy.org//etc/geomapfish/static/path/icon.png",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"url2": "http://dummy.org//etc/geomapfish/static/path/icon.png",
"url2": "http://dummy.org/etc/geomapfish/static/path/icon.png",

@sbrunner sbrunner merged commit c2c740e into master Jun 27, 2019
@sbrunner sbrunner deleted the move-apihelp branch June 27, 2019 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants