Skip to content

Add optional args param to build_url, make api_version optional #5244

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

Merged
joshmoore merged 1 commit into from
Apr 19, 2017
Merged

Add optional args param to build_url, make api_version optional #5244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions components/tools/OmeroWeb/omeroweb/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
from omeroweb.webgateway.util import getIntOrDefault


def build_url(request, name, api_version, **kwargs):
def build_url(request, name, api_version, *args, **kwargs):
"""
Helper for generating urls within /api json responses.

Expand All @@ -52,8 +52,9 @@ def build_url(request, name, api_version, **kwargs):
@param name: Name of the url
@param api_version Version string
"""
kwargs['api_version'] = api_version
url = reverse(name, kwargs=kwargs)
if api_version:
kwargs['api_version'] = api_version
url = reverse(name, args=args, kwargs=kwargs)
if api_settings.API_ABSOLUTE_URL is None:
return request.build_absolute_uri(url)
else:
Expand Down