Use url_for in all templates

This commit is contained in:
Gregor Sturm
2021-01-18 19:47:18 +01:00
parent 94062c2d64
commit 8c5a635de9
5 changed files with 14 additions and 11 deletions
+6 -3
View File
@@ -45,10 +45,13 @@ def recurse_dir(path):
"name": x[:-13] "name": x[:-13]
if (len(x) > 13 and x[-13] in ["-", "_"]) if (len(x) > 13 and x[-13] in ["-", "_"])
else (x[:-4] if x.endswith(".csv") else x), else (x[:-4] if x.endswith(".csv") else x),
"path": os.path.join(full_path, x).replace(env.cellxgene_data, ""), "path": os.path.join(full_path, x).replace(
env.cellxgene_data, ""
),
} }
for x in sorted(os.listdir(full_path)) for x in sorted(os.listdir(full_path))
if x.endswith(".csv") and os.path.isfile(os.path.join(full_path, x)) if x.endswith(".csv")
and os.path.isfile(os.path.join(full_path, x))
] ]
return [ return [
{ {
@@ -89,7 +92,7 @@ def render_entries(entries):
def get_url(entry): def get_url(entry):
return url_for("do_view", path=entry["path"]) return url_for("do_view", path=entry["path"].lstrip("/"))
def get_class(entry): def get_class(entry):
@@ -28,11 +28,11 @@
<h4>{{ message }}</h4> <h4>{{ message }}</h4>
<a href="/filecrawl.html"> <a href="{{ url_for('filecrawl') }}">
Please click here to be redirected to the file directory. Please click here to be redirected to the file directory.
</a> </a>
<br> <br>
<a href="/"> <a href="{{ url_for('index') }}">
Please click here to return to the homepage. Please click here to return to the homepage.
</a> </a>
</div> </div>
+2 -2
View File
@@ -36,10 +36,10 @@
Navigation: Navigation:
<ul> <ul>
{% if path %} {% if path %}
<li><a href="/filecrawl.html">top level</a></li> <li><a href="{{ url_for('filecrawl') }}">top level</a></li>
{% else %} {% else %}
{% endif %} {% endif %}
<li><a href="/">homepage</a></li> <li><a href="{{ url_for('index') }}">homepage</a></li>
</ul> </ul>
</p> </p>
<script> <script>
+2 -2
View File
@@ -35,11 +35,11 @@
The page will refresh shortly. The page will refresh shortly.
</p> </p>
<a href="/filecrawl.html"> <a href="{{ url_for('filecrawl') }}">
Please click here to be redirected to the file directory. Please click here to be redirected to the file directory.
</a> </a>
<br> <br>
<a href="/"> <a href="{{ url_for('index') }}">
Please click here to return to the homepage. Please click here to return to the homepage.
</a> </a>
</div> </div>
@@ -39,10 +39,10 @@
<li><a href="{{url_for('do_relaunch', path=dataset)}}"> <li><a href="{{url_for('do_relaunch', path=dataset)}}">
Attempt to relaunch the cellxgene server. Attempt to relaunch the cellxgene server.
</a></li> </a></li>
<li><a href="/filecrawl.html"> <li><a href="{{ url_for('filecrawl') }}">
Return to the file directory. Return to the file directory.
</a></li> </a></li>
<li><a href="/"> <li><a href="{{ url_for('index') }}">
Return to the homepage. Return to the homepage.
</a></li> </a></li>
</ul> </ul>