Skip to content

Commit c0cdb4b

Browse files
authored
Fix 3381 (#3408)
* Update CHANGELOG.md * fix #3381 * fallback * rm qiimp from test
1 parent 6ac8ee8 commit c0cdb4b

File tree

7 files changed

+5
-24
lines changed

7 files changed

+5
-24
lines changed

qiita_core/configuration_manager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,4 +389,4 @@ def _get_portal(self, config):
389389
raise ValueError(msg % (name, val, 'larger than 180°'))
390390

391391
def _iframe(self, config):
392-
self.iframe_qiimp = config.get('iframe', 'QIIMP')
392+
self.iframe_qiimp = config.get('iframe', 'QIIMP', fallback=None)

qiita_core/support_files/config_test.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,6 @@ STATS_MAP_CENTER_LONGITUDE =
193193

194194
# ----------------------------- iframes settings ---------------------------
195195
[iframe]
196-
# The real world QIIMP will always need to be accessed with https because Qiita
197-
# runs on https too
198-
QIIMP = https://localhost:8898/
196+
# On May 2024, we removed QIIMP from the code base but we will leave this
197+
# section in case we need to add access to another iframe in the future; note
198+
# that the qiita-terms are also accessed via iframe but this is internal

qiita_core/tests/test_configuration_manager.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def test_init(self):
109109
self.assertEqual(obs.portal_dir, "/portal")
110110

111111
# iframe section
112-
self.assertEqual(obs.iframe_qiimp, "https://localhost:8898/")
112+
self.assertIsNone(obs.iframe_qiimp)
113113

114114
def test_init_error(self):
115115
with open(self.conf_fp, 'w') as f:
@@ -471,7 +471,6 @@ def test_get_portal_latlong(self):
471471
472472
# ----------------------------- iframes settings ---------------------------
473473
[iframe]
474-
QIIMP = https://localhost:8898/
475474
"""
476475

477476
if __name__ == '__main__':

qiita_pet/support_files/doc/source/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Looking for information about getting started? Please see the document here:
2727

2828
gettingstartedguide/index.rst
2929
qiita-philosophy/index.rst
30-
qiimp.rst
3130

3231
Looking for information about how to process your data? Please see the document here:
3332

qiita_pet/support_files/doc/source/qiimp.rst

-10
This file was deleted.

qiita_pet/templates/iframe.html

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
{% if iframe == 'qiita-terms' %}
55
<iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{% raw qiita_config.portal_dir %}/static/qiita_data_terms_of_use.html"></iframe>
6-
{% elif iframe == 'qiimp' %}
7-
<iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{{qiita_config.iframe_qiimp}}"></iframe>
86
{% else %}
97
<b>No content</b>
108
{% end %}

qiita_pet/templates/sitebase.html

-5
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,6 @@
464464
<a href="/redbiom/">redbiom</a>
465465
</li>
466466
</ul>
467-
<ul class="nav navbar-nav">
468-
<li>
469-
<a href="{% raw qiita_config.portal_dir %}/iframe/?iframe=qiimp">Qiimp</a>
470-
</li>
471-
</ul>
472467
<ul class="nav navbar-nav">
473468
<!-- downloads -->
474469
<li class="dropdown">

0 commit comments

Comments
 (0)