-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -64,10 +113,8 @@
:assoc_layout="lz_layout" :assoc_sources="lz_sources"
:study_names="study_names" :has_credible_sets="true"
:build="build"
- :chr="c_chr" :start="c_start" :end="c_end" />
+ :chr="c_chr" :start="c_start" :end="c_end"/>
-
-
diff --git a/locuszoom_plotting_service/gwas/views.py b/locuszoom_plotting_service/gwas/views.py
index 5fb6edc..f28ab02 100644
--- a/locuszoom_plotting_service/gwas/views.py
+++ b/locuszoom_plotting_service/gwas/views.py
@@ -214,6 +214,10 @@ def get_context_data(self, **kwargs):
reverse('apiv1:gwas-region', kwargs={'slug': gwas.slug}),
token
),
+ 'top_hits_url': add_token(
+ reverse('gwas:manhattan-json', kwargs={'slug': gwas.slug}),
+ token,
+ ),
'label': gwas.label,
'build': gwas.build,
# Default region for bare URLs is the top hit in the study
diff --git a/locuszoom_plotting_service/taskapp/tasks.py b/locuszoom_plotting_service/taskapp/tasks.py
index 9987218..006a1e7 100644
--- a/locuszoom_plotting_service/taskapp/tasks.py
+++ b/locuszoom_plotting_service/taskapp/tasks.py
@@ -8,6 +8,7 @@
from django.db.models import signals
from django.db import transaction
from django.dispatch import receiver
+from django.urls import reverse
from django.utils import timezone
from zorp import (
@@ -156,8 +157,9 @@ def mark_success(self, fileset_id):
metadata.save()
# TODO: Render this as a nicer-looking template
+ log_url = reverse('gwas:gwas-ingest-log', kwargs={'slug': metadata.slug})
send_mail('[locuszoom] Upload succeeded',
- f'Your upload is done processing. Please visit https://{settings.LZ_OFFICIAL_DOMAIN}{metadata.get_absolute_url()} to see the Manhattan plot and begin exploring regions of your data.', # noqa
+ f'Your upload is done processing. Please visit https://{settings.LZ_OFFICIAL_DOMAIN}{metadata.get_absolute_url()} to see the Manhattan plot and begin exploring regions of your data.\nBe sure to review the ingest logs for any warnings: https://{settings.LZ_OFFICIAL_DOMAIN}{log_url}', # noqa
'locuszoom-service@umich.edu',
[metadata.owner.email])
@@ -176,8 +178,9 @@ def mark_failure(self, fileset_id):
instance.save()
metadata = instance.metadata
+ log_url = reverse('gwas:gwas-ingest-log', kwargs={'slug': metadata.slug})
send_mail('[locuszoom] Upload failed',
- f'Your upload failed to process. Please visit https://{settings.LZ_OFFICIAL_DOMAIN}{metadata.get_absolute_url()} to see the error logs.', # noqa
+ f'Your upload failed to process. Please review the ingest logs for warnings and error messages: https://{settings.LZ_OFFICIAL_DOMAIN}{log_url}\nOr visit the upload page to change settings: https://{settings.LZ_OFFICIAL_DOMAIN}{metadata.get_absolute_url()}', # noqa
'locuszoom-service@umich.edu',
[metadata.owner.email])
diff --git a/locuszoom_plotting_service/templates/base.html b/locuszoom_plotting_service/templates/base.html
index 42edabc..1a2f132 100644
--- a/locuszoom_plotting_service/templates/base.html
+++ b/locuszoom_plotting_service/templates/base.html
@@ -39,8 +39,8 @@
-
+
{% block css %}{% endblock %}
@@ -131,15 +131,12 @@
{# Javascript: global template code, plus custom items per page #}
-
-
-
+
+
+
{% block javascript %}{% endblock javascript %}