Skip to content

fix #2773 #2993

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 27, 2020
Merged

fix #2773 #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de7f63
fix #2773
antgonza Apr 24, 2020
dd13a75
addressing @ElDeveloper comment
antgonza Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion qiita_pet/handlers/qiita_redbiom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
import redbiom._requests
import redbiom.util
import redbiom.fetch
import redbiom.admin
from tornado.gen import coroutine, Task
from tornado.web import HTTPError
from requests.exceptions import HTTPError as rHTTPError

from qiita_core.util import execute_as_transaction
from qiita_db.util import generate_study_list_without_artifacts
Expand All @@ -27,9 +29,18 @@ class RedbiomPublicSearch(BaseHandler):
def get(self, search):
# making sure that if someone from a portal forces entry to this URI
# we go to the main portal
try:
timestamps = redbiom.admin.get_timestamps()
except (rHTTPError):
timestamps = []

if timestamps:
latest_release = timestamps[0]
else:
latest_release = 'Not reported'
if self.request.uri != '/redbiom/':
self.redirect('/redbiom/')
self.render('redbiom.html')
self.render('redbiom.html', latest_release=latest_release)

def _redbiom_metadata_search(self, query, contexts):
study_artifacts = defaultdict(lambda: defaultdict(list))
Expand Down
2 changes: 1 addition & 1 deletion qiita_pet/templates/redbiom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
{%block content%}
<small>
<!-- Date to be fixed once we fix: https://github.com/biocore/qiita/issues/2773 -->
Redbiom only searches on public data. Last update: December 18th, 2018. Note that you will only be able to expand and add artifacts to analyses if you are signed into Qiita.
Redbiom only searches on public data. Last update: <i>{{latest_release}}</i>. Note that you will only be able to expand and add artifacts to analyses if you are signed into Qiita.
<br/><br/>
<a href="{% raw qiita_config.portal_dir %}/static/doc/html/redbiom.html" class="btn btn-info btn-sm" target="_blank">Help and examples?</a>
<br/>
Expand Down