Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename parameter

Roland Geider84e36595f460
diff --git a/wger/utils/tests/test_url.py b/wger/utils/tests/test_url.py
index f7dc6fb6a..9c25994d8 100644
--- a/wger/utils/tests/test_url.py
+++ b/wger/utils/tests/test_url.py
@@ -35,7 +35,7 @@ class TestMakeUri(unittest.TestCase):
# Test with id
self.assertEqual(
- make_uri('test', id=123),
+ make_uri('test', object_id=123),
'https://wger.de/api/v2/test/123/',
)
@@ -53,7 +53,7 @@ class TestMakeUri(unittest.TestCase):
# Test with all parameters
self.assertEqual(
- make_uri('test', id=123, object_method='create', query={'key1': 'value1'}),
+ make_uri('test', object_id=123, object_method='create', query={'key1': 'value1'}),
'https://wger.de/api/v2/test/123/create/?key1=value1',
)
diff --git a/wger/utils/url.py b/wger/utils/url.py
index 3f9183635..0f5500362 100644
--- a/wger/utils/url.py
+++ b/wger/utils/url.py
@@ -28,7 +28,7 @@ from django.conf import settings
def make_uri(
path: str,
- id: Optional[int] = None,
+ object_id: Optional[int] = None,
object_method: Optional[str] = None,
query: Optional[Dict[str, any]] = None,
server_url: str = settings.WGER_SETTINGS['WGER_INSTANCE'],
@@ -37,8 +37,8 @@ def make_uri(
query = query or {}
path_list = [uri_server.path, 'api', 'v2', path]
- if id is not None:
- path_list.append(str(id))
+ if object_id is not None:
+ path_list.append(str(object_id))
if object_method is not None:
path_list.append(object_method)