Fix the way accession_id is set + update info link on correlation page

3 files changed, 8 insertions, 16 deletions

diff --git a/gn2/wqflask/templates/correlation_page.html b/gn2/wqflask/templates/correlation_page.html
index d3ee32f3..6baeff35 100644
--- a/gn2/wqflask/templates/correlation_page.html
+++ b/gn2/wqflask/templates/correlation_page.html
@@ -17,12 +17,12 @@
             <hr style="height: 1px; background-color: #A9A9A9;">
         </div>
         <div style="max-width: 100%;">
-          <p>Values of record {{ this_trait.name }} in the <a href="http://genenetwork.org/webqtl/main.py?FormID=sharinginfo&{% if this_dataset.accession_id %}GN_AccessionId={{ this_dataset.accession_id }}{% else %}InfoPageName={{ this_dataset.name }}{% endif %}">{{ this_dataset.fullname }}</a>
-          dataset were compared to all records in the <a href="http://genenetwork.org/webqtl/main.py?FormID=sharinginfo&{% if target_dataset.accession_id %}GN_AccessionId={{ target_dataset.accession_id }}{% else %}InfoPageName={{ target_dataset.name }}{% endif %}">{{ target_dataset.fullname }}</a>
-          dataset. The top {{ return_results }} correlations ranked by the {{ formatted_corr_type }} are displayed.
-          You can resort this list by clicking the headers. Select the Record ID to open the trait data
-          and analysis page.
-          </p>
+          <p>Values of record {{ this_trait.name }} in the <a href='https://info.genenetwork.org/{% if this_dataset.type != "ProbeSet" %}species/source.php?SpeciesName={{ this_dataset.group.species }}&InbredSetName={{ this_dataset.group.name }}{% else %}infofile/source.php?GN_AccesionId={{ this_dataset.accession_id }}{% endif %}' target="_blank">{{ this_dataset.fullname }}</a>
+            dataset were compared to all records in the <a href='https://info.genenetwork.org/{% if target_dataset.type != "ProbeSet" %}species/source.php?SpeciesName={{ target_dataset.group.species }}&InbredSetName={{ target_dataset.group.name }}{% else %}infofile/source.php?GN_AccesionId={{ target_dataset.accession_id }}{% endif %}' target="_blank">{{ target_dataset.fullname }}</a>
+            dataset. The top {{ return_results }} correlations ranked by the {{ formatted_corr_type }} are displayed.
+            You can resort this list by clicking the headers. Select the Record ID to open the trait data
+            and analysis page.
+            </p>
         </div>
         <div class="tool-button-container">
           <form id="correlation_form" target="_blank" action="/corr_matrix" method="post">
diff --git a/gn2/wqflask/templates/search_result_page.html b/gn2/wqflask/templates/search_result_page.html
index c4a36524..c25c5c25 100644
--- a/gn2/wqflask/templates/search_result_page.html
+++ b/gn2/wqflask/templates/search_result_page.html
@@ -17,7 +17,7 @@
         <div style="padding-top: 10px; padding-bottom: 10px; font-size: 16px;">
         <!-- Need to customize text more for other types of searches -->
 
-          <p>We searched {% if dataset.type != "ProbeSet" %}<a href="https://info.genenetwork.org/species/source.php?SpeciesName={{ dataset.group.species }}&InbredSetName={{ dataset.group.name }}" target="_blank">{{ dataset.fullname }}</a>{% else %}<a href="https://info.genenetwork.org/infofile/source.php?GN_AccesionId={{ dataset.accession_id }}" target="_blank">{{ dataset.fullname }}</a>{% endif %}
+          <p>We searched <a href='https://info.genenetwork.org/{% if dataset.type != "ProbeSet" %}species/source.php?SpeciesName={{ dataset.group.species }}&InbredSetName={{ dataset.group.name }}{% else %}infofile/source.php?GN_AccesionId={{ dataset.accession_id.value }}{% endif %}' target="_blank">{{ dataset.fullname }}</a>
           <br>
           to find all records
                 {% if go_term is not none %}
diff --git a/gn2/wqflask/templates/show_trait_details.html b/gn2/wqflask/templates/show_trait_details.html
index 8447fbc7..dc5a49ce 100644
--- a/gn2/wqflask/templates/show_trait_details.html
+++ b/gn2/wqflask/templates/show_trait_details.html
@@ -59,15 +59,7 @@
     <tr>
         <td><b>Database</b></td>
         <td>
-            {% if dataset.type != "ProbeSet" %}
-            <a href="https://info.genenetwork.org/species/source.php?SpeciesName={{ dataset.group.species }}&InbredSetName={{ dataset.group.name }}" target="_blank">
-                {{ dataset.fullname }}
-            </a>
-            {% else %}
-            <a href="https://info.genenetwork.org/infofile/source.php?GN_AccesionId={{ dataset.accession_id }}" target="_blank">
-                {{ dataset.fullname }}
-            </a>
-            {% endif %}
+            <a href='https://info.genenetwork.org/{% if dataset.type != "ProbeSet" %}species/source.php?SpeciesName={{ dataset.group.species }}&InbredSetName={{ dataset.group.name }}{% else %}infofile/source.php?GN_AccesionId={{ dataset.accession_id.value }}{% endif %}' target="_blank">{{ dataset.fullname }}</a>
         </td>
     </tr>
     {% if this_trait.probe_set_specificity %}