Skip to content

Commit

Permalink
Merge branch 'develop' into feature/browser_integration
Browse files Browse the repository at this point in the history
* develop:
  Better error message for beacon API
  Addec ACpop to beacon TODO move to config
  Show future versions to people that know the URL
  Updated nbislogo to have transparent background
  • Loading branch information
viklund committed Jun 19, 2018
2 parents b510d8d + 96227b4 commit 66fba67
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 0 additions & 4 deletions backend/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ def get(self, dataset, version=None):
version = db.get_dataset_version(dataset, version)

if version.available_from > datetime.now():
# If it's not available yet, only return if user is admin.
if not (user and user.is_admin(version.dataset)):
self.send_error(status_code=403)
return
future_version = True

ret = build_dataset_structure(version, user)
Expand Down
8 changes: 7 additions & 1 deletion backend/beacon.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ class Query(handlers.UnsafeHandler):
def make_error_response(self):
ret_str = ""

datasets = ['SweGen', 'ACpop']

checks = {
'dataset': lambda x: "" if x == 'SweGen' else "dataset has to be SweGen\n",
'dataset': lambda x: "" if x in datasets else "dataset has to be one of {}\n".format(", ".join(datasets)),
'ref': lambda x: "" if x == 'hg19' else "ref has to be hg19\n",
'pos': lambda x: "" if x.isdigit() else "pos has to be digit\n",
}
Expand Down Expand Up @@ -80,6 +82,10 @@ def get(self):
# 'data_uses': [] # Data use limitations
'reference': 'hg19'
},
{
'id': 'ACpop',
'reference': 'hg19'
},
],
'homepage': "%s://%s" % ('https', self.request.host),
#'email': u'swefreq-beacon@nbis.se',
Expand Down
Binary file modified frontend/assets/img/nbislogo-green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 66fba67

Please sign in to comment.