Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3381 #3408

Merged
merged 11 commits into from
May 16, 2024
2 changes: 1 addition & 1 deletion qiita_core/configuration_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,4 @@ def _get_portal(self, config):
raise ValueError(msg % (name, val, 'larger than 180°'))

def _iframe(self, config):
self.iframe_qiimp = config.get('iframe', 'QIIMP')
self.iframe_qiimp = config.get('iframe', 'QIIMP', fallback=None)
6 changes: 3 additions & 3 deletions qiita_core/support_files/config_test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,6 @@ STATS_MAP_CENTER_LONGITUDE =

# ----------------------------- iframes settings ---------------------------
[iframe]
# The real world QIIMP will always need to be accessed with https because Qiita
# runs on https too
QIIMP = https://localhost:8898/
# On May 2024, we removed QIIMP from the code base but we will leave this
# section in case we need to add access to another iframe in the future; note
# that the qiita-terms are also accessed via iframe but this is internal
3 changes: 1 addition & 2 deletions qiita_core/tests/test_configuration_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def test_init(self):
self.assertEqual(obs.portal_dir, "/portal")

# iframe section
self.assertEqual(obs.iframe_qiimp, "https://localhost:8898/")
self.assertIsNone(obs.iframe_qiimp)

def test_init_error(self):
with open(self.conf_fp, 'w') as f:
Expand Down Expand Up @@ -471,7 +471,6 @@ def test_get_portal_latlong(self):

# ----------------------------- iframes settings ---------------------------
[iframe]
QIIMP = https://localhost:8898/
"""

if __name__ == '__main__':
Expand Down
1 change: 0 additions & 1 deletion qiita_pet/support_files/doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Looking for information about getting started? Please see the document here:

gettingstartedguide/index.rst
qiita-philosophy/index.rst
qiimp.rst

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

Expand Down
10 changes: 0 additions & 10 deletions qiita_pet/support_files/doc/source/qiimp.rst

This file was deleted.

2 changes: 0 additions & 2 deletions qiita_pet/templates/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

{% if iframe == 'qiita-terms' %}
<iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{% raw qiita_config.portal_dir %}/static/qiita_data_terms_of_use.html"></iframe>
{% elif iframe == 'qiimp' %}
<iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{{qiita_config.iframe_qiimp}}"></iframe>
{% else %}
<b>No content</b>
{% end %}
Expand Down
5 changes: 0 additions & 5 deletions qiita_pet/templates/sitebase.html
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,6 @@
<a href="/redbiom/">redbiom</a>
</li>
</ul>
<ul class="nav navbar-nav">
<li>
<a href="{% raw qiita_config.portal_dir %}/iframe/?iframe=qiimp">Qiimp</a>
</li>
</ul>
<ul class="nav navbar-nav">
<!-- downloads -->
<li class="dropdown">
Expand Down
Loading