aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2024-06-05 16:37:12 -0500
committerAlexander_Kabui2024-08-28 15:02:45 +0300
commit16b9ccc56a99f1290825c36b3788590a585920a6 (patch)
treed8ea2c74314a1b9928597115b12880d2ecab8d20
parent2439a4a0af29a57adc55fec093e4231c7b320ff6 (diff)
downloadgenenetwork2-16b9ccc56a99f1290825c36b3788590a585920a6.tar.gz
Build search URI endpoint on server rather than on JS
To help with maintenance, build the search URI on the server rather than in the javascript.
-rw-r--r--gn2/wqflask/oauth2/data.py2
-rw-r--r--gn2/wqflask/static/new/javascript/auth/search_phenotypes.js2
-rw-r--r--gn2/wqflask/templates/oauth2/data-list-phenotype.html1
3 files changed, 3 insertions, 2 deletions
diff --git a/gn2/wqflask/oauth2/data.py b/gn2/wqflask/oauth2/data.py
index b7c7800c..767de1a3 100644
--- a/gn2/wqflask/oauth2/data.py
+++ b/gn2/wqflask/oauth2/data.py
@@ -69,7 +69,7 @@ def __search_phenotypes__(query, template, **kwargs):
template, traits=[], per_page=per_page, query=query,
selected_traits=selected_traits, search_results=search_results,
search_endpoint=urljoin(
- authserver_uri(), "auth/data/search"),
+ request.host_url, "oauth2/data/phenotype/search"),
auth_server_url=authserver_uri(),
pheno_results_template=urljoin(
authserver_uri(), "auth/data/search/phenotype/<jobid>"),
diff --git a/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js b/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
index e9ef2683..8689af75 100644
--- a/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
+++ b/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
@@ -119,7 +119,7 @@ function search_phenotypes() {
per_page = document.getElementById("txt-per-page").value
search_table = new TableDataSource(
"#tbl-phenotypes", "data-traits", search_checkbox);
- endpoint = "/auth/data/phenotype/search"
+ endpoint = endpoint = $("#frm-search-traits").attr("data-search-endpoint");
$.ajax(
endpoint,
{
diff --git a/gn2/wqflask/templates/oauth2/data-list-phenotype.html b/gn2/wqflask/templates/oauth2/data-list-phenotype.html
index b23c16e2..d355f3f9 100644
--- a/gn2/wqflask/templates/oauth2/data-list-phenotype.html
+++ b/gn2/wqflask/templates/oauth2/data-list-phenotype.html
@@ -113,6 +113,7 @@
<form id="frm-search-traits"
action="#"
method="POST"
+ data-search-endpoint="{{search_endpoint}}"
data-pheno-results-template="{{pheno_results_template}}">
{%if dataset_type == "mrna"%}
<legend>mRNA: Search</legend>