diff options
| -rw-r--r-- | gn2/base/data_set/dataset.py | 2 | ||||
| -rw-r--r-- | gn2/wqflask/templates/search_result_page.html | 2 | ||||
| -rw-r--r-- | gn2/wqflask/templates/show_trait_details.html | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/gn2/base/data_set/dataset.py b/gn2/base/data_set/dataset.py index 3a62fbde..1b1cf9ac 100644 --- a/gn2/base/data_set/dataset.py +++ b/gn2/base/data_set/dataset.py @@ -44,7 +44,7 @@ class DataSet: self.retrieve_other_names() # sets self.group and self.group_id and gets genotype self.group = DatasetGroup(self) - self.accession_id = self.get_accession_id() + self.accession_id = self.get_accession_id().value if get_samplelist == True: self.group.get_samplelist(redis_conn) self.species = species.TheSpecies(dataset=self) diff --git a/gn2/wqflask/templates/search_result_page.html b/gn2/wqflask/templates/search_result_page.html index cade198a..c4a36524 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 <a href="http://genenetwork.org/webqtl/main.py?FormID=sharinginfo&{% if dataset.accession_id %}GN_AccessionId={{dataset.accession_id }}{% else %}InfoPageName={{ dataset.name }}{% endif %}">{{ dataset.fullname }}</a> + <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 %} <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 9c12393d..8447fbc7 100644 --- a/gn2/wqflask/templates/show_trait_details.html +++ b/gn2/wqflask/templates/show_trait_details.html @@ -59,13 +59,15 @@ <tr> <td><b>Database</b></td> <td> - <a href="http://gn1.genenetwork.org/webqtl/main.py?FormID=sharinginfo&InfoPageName={{ dataset.name }}" target="_blank"> + {% 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> - <br/> - <a href="{{ url_for('get_dataset', name=dataset.name) }}" target="_blank"> - GN2 Link: {{ dataset.fullname }} + {% else %} + <a href="https://info.genenetwork.org/infofile/source.php?GN_AccesionId={{ dataset.accession_id }}" target="_blank"> + {{ dataset.fullname }} </a> + {% endif %} </td> </tr> {% if this_trait.probe_set_specificity %} |