You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/06/18 19:38:34 UTC
[airavata-django-portal] 17/20: AIRAVATA-3453 Calling context
processor to populate species list
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-3453
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 3d122864e1b18da37f3c708ed9d4ed4eddae93b8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue May 18 16:54:42 2021 -0400
AIRAVATA-3453 Calling context processor to populate species list
---
.../workspace/templates/django_airavata_workspace/supcrtbl2.html | 4 +++-
django_airavata/apps/workspace/views.py | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/workspace/templates/django_airavata_workspace/supcrtbl2.html b/django_airavata/apps/workspace/templates/django_airavata_workspace/supcrtbl2.html
index 5edd42c..945026f 100644
--- a/django_airavata/apps/workspace/templates/django_airavata_workspace/supcrtbl2.html
+++ b/django_airavata/apps/workspace/templates/django_airavata_workspace/supcrtbl2.html
@@ -213,7 +213,9 @@ $('document').ready(function() {
$('#reaction').textcomplete([{
match: /(^|\b)(\S{1,})$/,
search: function (term, callback) {
- var words = ["ALMANDINE","ANDRADITE","GROSSULAR","KNORRINGITE","MAJORITE","PYROPE","SPESSARTINE","CLINOHUMITE","FAYALITE","FORSTERITE","MONTICELLITE","TEPHROITE","ANDALUSITE","KYANITE","Al-MULLITE","Si-MULLITE","Fe-CHLORITOID","Mg-CHLORITOID","Mn-CHLORITOID","Fe-STAUROLITE","Mg-STAUROLITE","Mn-STAUROLITE","HYDROXY-TOPAZ","AKERMANITE","JULGOLDITE(FeFe)","MERWINITE","PUMPELLYITE(FeAl)","PUMPELLYITE(MgAl)","RANKINITE","SPURRITE","TILLEYITE","ZIRCON","CLINOZOISITE","EPIDOTE(ORDERED)"," [...]
+ var words = [
+ {% for a_species in species %}"{{ a_species|escapejs }}", {% endfor %}
+ ];
callback($.map(words, function (word) {
return word.toLowerCase().indexOf(term.toLowerCase()) === 0 ? word : null;
}));
diff --git a/django_airavata/apps/workspace/views.py b/django_airavata/apps/workspace/views.py
index a701800..0b69ede 100644
--- a/django_airavata/apps/workspace/views.py
+++ b/django_airavata/apps/workspace/views.py
@@ -69,6 +69,11 @@ def edit_project(request, project_id):
})
+def species_list(request):
+ return {
+ 'species': ["ALMANDINE","ANDRADITE","GROSSULAR","KNORRINGITE","MAJORITE","PYROPE","SPESSARTINE","CLINOHUMITE","FAYALITE","FORSTERITE","MONTICELLITE","TEPHROITE","ANDALUSITE","KYANITE","Al-MULLITE","Si-MULLITE","Fe-CHLORITOID","Mg-CHLORITOID","Mn-CHLORITOID","Fe-STAUROLITE","Mg-STAUROLITE","Mn-STAUROLITE","HYDROXY-TOPAZ","AKERMANITE","JULGOLDITE(FeFe)","MERWINITE","PUMPELLYITE(FeAl)","PUMPELLYITE(MgAl)","RANKINITE","SPURRITE","TILLEYITE","ZIRCON","CLINOZOISITE","EPIDOTE(ORDERED)", [...]
+ }
+
@login_required
def create_experiment(request, app_module_id):
request.active_nav_item = 'dashboard'
@@ -113,6 +118,9 @@ def create_experiment(request, app_module_id):
if 'experiment-data-dir' in request.GET:
context['experiment_data_dir'] = request.GET['experiment-data-dir']
+ # Run through context processors
+ for processor in [species_list]:
+ context.update(species_list(request))
return render(request,
# 'django_airavata_workspace/create_experiment.html',
'django_airavata_workspace/supcrtbl2.html',