fork/cellxgene-gateway
1
0
Fork 0
mirror of https://github.com/Novartis/cellxgene-gateway.git synced 2026-10-08 08:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

only include source path element in url when multiple sources

Browse Source
This commit is contained in:
Alok Saldanha
2021-04-02 11:40:11 -04:00
parent b1ae9e8ce8
commit 5c488d8d5e
5 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/filecrawl.py
+6 -10
View File
@@ -10,23 +10,20 @@
import os
import urllib.parse
from flask import url_for
from cellxgene_gateway import env
from cellxgene_gateway import env, flask_util
from cellxgene_gateway.cache_key import CacheKey
from cellxgene_gateway.dir_util import annotations_suffix, make_annotations, make_h5ad
def render_annotations(item, item_source):
url = url_for(
"do_view",
path=item_source.get_annotations_subpath(item),
source_name=item_source.name,
url = flask_util.view_url(
item_source.get_annotations_subpath(item), item_source.name
)
new_annotation = f"<a class='new' href='{url}'>new</a>"
annotations = (
", ".join(
[
f"<a href='{url_for('do_view', path=a.descriptor, source_name = item_source.name)}/'>{a.name}</a>"
f"<a href='{CacheKey(item, item_source, a).view_url}/'>{a.name}</a>"
for a in item.annotations
]
)
@@ -38,8 +35,7 @@ def render_annotations(item, item_source):
def render_item(item, item_source):
url = url_for("do_view", path=item.descriptor, source_name=item_source.name) + "/"
item_string = f"<li> <a href='{ url }'>{item.name}</a> {render_annotations(item, item_source)}</li>"
item_string = f"<li> <a href='{ CacheKey(item, item_source).view_url }/'>{item.name}</a> {render_annotations(item, item_source)}</li>"
return item_string