diff --git a/swh/web/browse/snapshot_context.py b/swh/web/browse/snapshot_context.py --- a/swh/web/browse/snapshot_context.py +++ b/swh/web/browse/snapshot_context.py @@ -1221,7 +1221,7 @@ revision_url = reverse( "browse-revision", url_args={"sha1_git": branch["revision"]}, - query_params={"origin": origin_info["url"]}, + query_params={"origin_url": origin_info["url"]}, ) query_params["branch"] = branch["name"] directory_url = reverse( @@ -1325,7 +1325,7 @@ if snapshot_id: query_params_tgt = {"snapshot_id": snapshot_id} else: - query_params_tgt = {"origin": origin_info["url"]} + query_params_tgt = {"origin_url": origin_info["url"]} release_url = reverse( "browse-release", url_args={"sha1_git": release["id"]}, diff --git a/swh/web/browse/utils.py b/swh/web/browse/utils.py --- a/swh/web/browse/utils.py +++ b/swh/web/browse/utils.py @@ -334,7 +334,7 @@ query_params = None if snapshot_context and snapshot_context["origin_info"]: origin_info = snapshot_context["origin_info"] - query_params = {"origin": origin_info["url"]} + query_params = {"origin_url": origin_info["url"]} if "timestamp" in snapshot_context["query_params"]: query_params["timestamp"] = snapshot_context["query_params"]["timestamp"] if "visit_id" in snapshot_context["query_params"]: diff --git a/swh/web/browse/views/content.py b/swh/web/browse/views/content.py --- a/swh/web/browse/views/content.py +++ b/swh/web/browse/views/content.py @@ -249,7 +249,7 @@ directory_id = None directory_url = None - query_params = {"origin": origin_url} + query_params = {"origin_url": origin_url} breadcrumbs = [] diff --git a/swh/web/browse/views/directory.py b/swh/web/browse/views/directory.py --- a/swh/web/browse/views/directory.py +++ b/swh/web/browse/views/directory.py @@ -73,7 +73,7 @@ path_info = gen_path_info(path) - query_params = {"origin": origin_url} + query_params = {"origin_url": origin_url} breadcrumbs = [] breadcrumbs.append( @@ -125,7 +125,7 @@ url_args={"query_string": query_string}, query_params={ "path": root_sha1_git + "/" + path + f["name"], - "origin": origin_url, + "origin_url": origin_url, }, ) if f["length"] is not None: diff --git a/swh/web/browse/views/revision.py b/swh/web/browse/views/revision.py --- a/swh/web/browse/views/revision.py +++ b/swh/web/browse/views/revision.py @@ -409,7 +409,7 @@ query_params = { "snapshot_id": snapshot_id, - "origin": origin_url, + "origin_url": origin_url, "timestamp": timestamp, "visit_id": visit_id, } @@ -533,7 +533,7 @@ "diff-revision", url_args={"sha1_git": sha1_git}, query_params={ - "origin": origin_url, + "origin_url": origin_url, "timestamp": timestamp, "visit_id": visit_id, }, diff --git a/swh/web/common/identifiers.py b/swh/web/common/identifiers.py --- a/swh/web/common/identifiers.py +++ b/swh/web/common/identifiers.py @@ -94,7 +94,7 @@ for k in sorted(query_params.keys()): query_dict[k] = query_params[k] if "origin" in swh_id_parsed.metadata: - query_dict["origin"] = swh_id_parsed.metadata["origin"] + query_dict["origin_url"] = swh_id_parsed.metadata["origin"] if object_type == CONTENT: query_string = "sha1_git:" + object_id fragment = "" diff --git a/swh/web/tests/api/views/test_identifiers.py b/swh/web/tests/api/views/test_identifiers.py --- a/swh/web/tests/api/views/test_identifiers.py +++ b/swh/web/tests/api/views/test_identifiers.py @@ -52,7 +52,7 @@ browse_rev_url = reverse( "browse-%s" % obj_type, url_args=url_args, - query_params={"origin": origin["url"]}, + query_params={"origin_url": origin["url"]}, request=resp.wsgi_request, ) diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py --- a/swh/web/tests/browse/views/test_directory.py +++ b/swh/web/tests/browse/views/test_directory.py @@ -66,7 +66,7 @@ url = reverse( "browse-directory", url_args={"sha1_git": directory}, - query_params={"origin": origin_url}, + query_params={"origin_url": origin_url}, ) resp = client.get(url) diff --git a/swh/web/tests/browse/views/test_identifiers.py b/swh/web/tests/browse/views/test_identifiers.py --- a/swh/web/tests/browse/views/test_identifiers.py +++ b/swh/web/tests/browse/views/test_identifiers.py @@ -53,7 +53,7 @@ assert resp.status_code == 302 assert resp["location"] == revision_browse_url - query_params = {"origin": "https://github.com/user/repo"} + query_params = {"origin_url": "https://github.com/user/repo"} url = reverse( "browse-swh-id", url_args={"swh_id": swh_id}, query_params=query_params @@ -80,7 +80,7 @@ assert resp.status_code == 302 assert resp["location"] == release_browse_url - query_params = {"origin": "https://github.com/user/repo"} + query_params = {"origin_url": "https://github.com/user/repo"} url = reverse( "browse-swh-id", url_args={"swh_id": swh_id}, query_params=query_params @@ -107,7 +107,7 @@ assert resp.status_code == 302 assert resp["location"] == snapshot_browse_url - query_params = {"origin": "https://github.com/user/repo"} + query_params = {"origin_url": "https://github.com/user/repo"} url = reverse( "browse-swh-id", url_args={"swh_id": swh_id}, query_params=query_params @@ -142,7 +142,7 @@ content_browse_url = reverse( "browse-content", url_args={"query_string": query_string}, - query_params={"origin": "https://github.com/user/repo"}, + query_params={"origin_url": "https://github.com/user/repo"}, ) content_browse_url += "#L4-L20" diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py --- a/swh/web/tests/browse/views/test_origin.py +++ b/swh/web/tests/browse/views/test_origin.py @@ -1017,7 +1017,7 @@ browse_revision_url = reverse( "browse-revision", url_args={"sha1_git": branch["revision"]}, - query_params={"origin": origin_info["url"]}, + query_params={"origin_url": origin_info["url"]}, ) assert_contains(resp, '' % escape(browse_revision_url)) @@ -1055,12 +1055,12 @@ browse_release_url = reverse( "browse-release", url_args={"sha1_git": release["id"]}, - query_params={"origin": origin_info["url"]}, + query_params={"origin_url": origin_info["url"]}, ) browse_revision_url = reverse( "browse-revision", url_args={"sha1_git": release["target"]}, - query_params={"origin": origin_info["url"]}, + query_params={"origin_url": origin_info["url"]}, ) assert_contains(resp, '' % escape(browse_release_url)) diff --git a/swh/web/tests/browse/views/test_release.py b/swh/web/tests/browse/views/test_release.py --- a/swh/web/tests/browse/views/test_release.py +++ b/swh/web/tests/browse/views/test_release.py @@ -33,7 +33,7 @@ url = reverse( "browse-release", url_args={"sha1_git": release["target"]}, - query_params={"origin": origin["url"]}, + query_params={"origin_url": origin["url"]}, ) release_data = archive_data.release_get(release["target"]) @@ -70,7 +70,7 @@ def _release_browse_checks(resp, release_data, archive_data, origin_info=None): query_params = {} if origin_info: - query_params["origin"] = origin_info["url"] + query_params["origin_url"] = origin_info["url"] release_id = release_data["id"] release_name = release_data["name"] diff --git a/swh/web/tests/browse/views/test_revision.py b/swh/web/tests/browse/views/test_revision.py --- a/swh/web/tests/browse/views/test_revision.py +++ b/swh/web/tests/browse/views/test_revision.py @@ -65,7 +65,7 @@ url = reverse( "browse-revision", url_args={"sha1_git": revision}, - query_params={"origin": origin["url"]}, + query_params={"origin_url": origin["url"]}, ) resp = client.get(url) @@ -76,7 +76,7 @@ parent_url = reverse( "browse-revision", url_args={"sha1_git": parent}, - query_params={"origin": origin["url"]}, + query_params={"origin_url": origin["url"]}, ) assert_contains(resp, '%s' % (parent_url, parent)) @@ -223,7 +223,7 @@ url = reverse( "browse-revision", url_args={"sha1_git": revision}, - query_params={"origin": new_origin.url}, + query_params={"origin_url": new_origin.url}, ) resp = client.get(url) diff --git a/swh/web/tests/common/test_identifiers.py b/swh/web/tests/common/test_identifiers.py --- a/swh/web/tests/common/test_identifiers.py +++ b/swh/web/tests/common/test_identifiers.py @@ -66,7 +66,7 @@ url_args["snapshot_id"] = obj_id else: url_args["sha1_git"] = obj_id - query_params = {"origin": "some-origin"} + query_params = {"origin_url": "some-origin"} browse_url = reverse( f"browse-{obj_type}", url_args=url_args, query_params=query_params )