Merge pull request #400 from ImagingDataCommons/sprint-13-sp

Fix for cohort saving
ImagingDataCommons · Oct 15, 2020 · 0cc178b · 0cc178b
2 parents d53ea76 + f66052a
commit 0cc178b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/js/image_search.js b/static/js/image_search.js
@@ -2580,8 +2580,8 @@ require([
     $('#save-cohort-btn').on('click', function() {
         if(!user_is_auth) {
             save_anonymous_selection_data();
+            location.href=$(this).data('uri');
         }
-        location.href=$(this).data('uri');
     });
 
      var cohort_loaded = false;

diff --git a/templates/base.html b/templates/base.html
@@ -168,6 +168,12 @@ <h4 class="modal-title" id="logoutModalLabel">Logout</h4>
     </script>
     {% endlocalize %}
 {% endif %}
+
+<!-- Additional includes brought in by specific child templates -->
+{% block modal_includes %}
+
+{% endblock %}
+
 {% block js_file %}
     <script src="{% static 'js/libs/require.js' %}"></script>
 {% endblock %}

diff --git a/templates/idc/explore.html b/templates/idc/explore.html
@@ -23,8 +23,6 @@
 {% block header %}
     <link type="text/css" rel="stylesheet" href="{% static 'css/search.css' %}">
     <link type="text/css" rel="stylesheet" href="{% static 'css/jquery-ui.min.css' %}">
-    <!-- <script src="https://d3js.org/d3.v5.min.js"></script> -->
-    <!-- <script type="text/javascript" src="{% static 'js/libs/d3.v5.min.js' %}"></script> -->
 {% endblock %}
 
 
@@ -69,6 +67,10 @@ <h3 class="pull-left" role="heading" aria-level="1">Explore Image Data</h3>
 
 {% include "idc/explore_data_core.html" %}
 
+{% endblock %}
+
+{% block modal_includes %}
+
 {% include "cohorts/save-cohort-modal.html" %}
 
 {% endblock %}