From fd752029bc8c83c2fa423f42d23ec1bd7e28e957 Mon Sep 17 00:00:00 2001 From: Johan Viklund Date: Tue, 18 Oct 2016 14:11:00 +0200 Subject: [PATCH] Added separate admin interface --- tornado/application.py | 7 ++- tornado/applicationTemplate.py | 6 +- tornado/auth.py | 7 +++ tornado/javascript/app.js | 6 +- tornado/static/admin.html | 110 +++++++++++++++++++++++++++++++++ tornado/static/home.html | 105 +------------------------------ 6 files changed, 134 insertions(+), 107 deletions(-) create mode 100644 tornado/static/admin.html diff --git a/tornado/application.py b/tornado/application.py index 6955f7323..5396c3d36 100644 --- a/tornado/application.py +++ b/tornado/application.py @@ -150,15 +150,20 @@ class home(auth.UnsafeHandler): def get(self, *args, **kwargs): t = template.Template(applicationTemplate.indexHead) self.write(t.generate()) + + is_admin = False + if self.get_current_token() != None: t = template.Template(applicationTemplate.indexHtml) + is_admin = self.is_admin() elif self.get_current_user() != None: t = template.Template(applicationTemplate.indexNoAccess) else: t = template.Template(applicationTemplate.notAuthorizedHtml) - logging.info(self.get_current_user()) + self.write(t.generate(user_name=self.get_current_user(), email=self.get_current_email(), + is_admin=is_admin, ExAC=secrets.ExAC_server)) class getUser(auth.UnsafeHandler): diff --git a/tornado/applicationTemplate.py b/tornado/applicationTemplate.py index 1de5b5fd9..d38d39155 100644 --- a/tornado/applicationTemplate.py +++ b/tornado/applicationTemplate.py @@ -46,7 +46,11 @@ class="btn btn-default">ExAC Browser Download Data    + class="btn btn-default">Download Data + {%if is_admin %} + Admin{% end %}   
{%if user_name != None%} {{user_name}} Logout diff --git a/tornado/auth.py b/tornado/auth.py index 50afdc3f7..4ca084201 100644 --- a/tornado/auth.py +++ b/tornado/auth.py @@ -56,6 +56,13 @@ def get_current_user_name(self): return user return user + def is_admin(self): + email = self.get_current_email() + tRes = db.query("""select full_user from swefreq.users where + email='%s' and swefreq_admin='YES'""" % email) + lAdmin = True if len(tRes) == 1 else False + return lAdmin + def write_error(self, status_code, **kwargs): """ Overwrites write_error method to have custom error pages. http://tornado.readthedocs.org/en/latest/web.html#tornado.web.RequestHandler.write_error diff --git a/tornado/javascript/app.js b/tornado/javascript/app.js index 6b9f879e3..0141cd757 100644 --- a/tornado/javascript/app.js +++ b/tornado/javascript/app.js @@ -16,7 +16,7 @@ ///////////////////////////////////////////////////////////////////////////////////// - App.controller('sweFreqController', function($http, $scope) { + App.controller('adminController', function($http, $scope) { var localThis = this; this.userName = ''; this.email = ''; @@ -200,6 +200,10 @@ .when('/privacyPolicy/', { templateUrl : 'static/privacyPolicy.html' }) + // Admin interface + .when('/admin/', { + templateUrl : 'static/admin.html' + }) }); })(); diff --git a/tornado/static/admin.html b/tornado/static/admin.html new file mode 100644 index 000000000..aa5c1d0e2 --- /dev/null +++ b/tornado/static/admin.html @@ -0,0 +1,110 @@ + +
+
+
+
+
+

You need to be logged in as an admin to use this page. +

+
+
+
+
+ +
+
+
+
+
+
+ + + + + +
+
+
+
+
Approve
+
+ Delete
{{row.user}}
+
{{row.email}}
+
{{row.affiliation}}
+
{{row.country}}
+
{{row.applyDate}}
+
+
+
+
+
+
+
+
+
+ + + + + +
+
+
+
+
+ Revoke
{{row.user}}
+
{{row.email}}
+
{{row.affiliation}}
+
{{row.country}}
+
{{row.downloadCount}}
+
+
+
+
+
+
+
+
+
+ + {{email}}{{$last ? '' : ', '}} + +
+
+
+
+
+
+
+
+
diff --git a/tornado/static/home.html b/tornado/static/home.html index dc89bbf57..a4db7ac29 100644 --- a/tornado/static/home.html +++ b/tornado/static/home.html @@ -1,15 +1,13 @@ -
+


-

SweGen Variant Frequency Database

-

This server hosts whole-genome variant frequencies for 1000 Swedish individuals generated within the SweGen project. The frequency data is intended to be used as a resource for the research @@ -24,7 +22,6 @@

SweGen Variant Frequency Database

or causative of, disease.

We request that any use of data from the SweGen project cite this preprint on bioRxiv.

-
@@ -36,105 +33,5 @@

SweGen Variant Frequency Database

-
-
-
-
- -
-
-
-
-
-
- - - - - -
-
-
-
-
Approve
-
- Delete
{{row.user}}
-
{{row.email}}
-
{{row.affiliation}}
-
{{row.country}}
-
{{row.applyDate}}
-
-
-
-
-
-
-
-
-
- - - - - -
-
-
-
-
- Revoke
{{row.user}}
-
{{row.email}}
-
{{row.affiliation}}
-
{{row.country}}
-
{{row.downloadCount}}
-
-
-
-
-
-
-
-
-
- - {{email}}{{$last ? '' : ', '}} - -
-
-
-
-
-
-