From 2098511f591b0b0fe53195cd881fbec8fe65bd41 Mon Sep 17 00:00:00 2001 From: Stefano Borini Date: Mon, 6 Mar 2017 15:45:34 +0000 Subject: [PATCH 1/4] Fixes incorrect name in admin header Fixes #348 --- .../handlers/admin/accounting_handler.py | 8 +-- .../admin/tests/test_admin_handlers.py | 7 +- .../templates/admin/accounting.html | 4 +- .../admin_check_name_in_header_bug_348.html | 67 +++++++++++++++++++ selenium_tests/test_admin_name_header_bug.py | 31 +++++++++ 5 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 selenium_tests/IDE/admin_check_name_in_header_bug_348.html create mode 100644 selenium_tests/test_admin_name_header_bug.py diff --git a/remoteappmanager/handlers/admin/accounting_handler.py b/remoteappmanager/handlers/admin/accounting_handler.py index b53790dac..4e818b861 100644 --- a/remoteappmanager/handlers/admin/accounting_handler.py +++ b/remoteappmanager/handlers/admin/accounting_handler.py @@ -11,12 +11,12 @@ def get(self, id): id = int(id) db = self.application.db - user = db.get_user(id=id) + acc_user = db.get_user(id=id) - if user is None: + if acc_user is None: raise web.HTTPError(404) - apps = db.get_apps_for_user(user) + apps = db.get_apps_for_user(acc_user) info = [{"mapping_id": mapping_id, "app": app, @@ -25,5 +25,5 @@ def get(self, id): self.render('admin/accounting.html', info=info, - user=user, + acc_user=acc_user, tab="users") diff --git a/remoteappmanager/handlers/admin/tests/test_admin_handlers.py b/remoteappmanager/handlers/admin/tests/test_admin_handlers.py index 0da8f8e32..fa83cfee8 100644 --- a/remoteappmanager/handlers/admin/tests/test_admin_handlers.py +++ b/remoteappmanager/handlers/admin/tests/test_admin_handlers.py @@ -1,6 +1,6 @@ from remoteappmanager.tests import utils from remoteappmanager.tests.mocking import dummy - +from BeautifulS class TestBaseAccess(utils.AsyncHTTPTestCase): #: which url to poke @@ -68,3 +68,8 @@ def test_unknown_id(self): }) self.assertEqual(res.code, 404) + + def test_correct_username_in_header(self): + bs + + diff --git a/remoteappmanager/templates/admin/accounting.html b/remoteappmanager/templates/admin/accounting.html index 163bac4b6..f15f9d04e 100644 --- a/remoteappmanager/templates/admin/accounting.html +++ b/remoteappmanager/templates/admin/accounting.html @@ -1,6 +1,6 @@ {% extends "admin/page.html" %} -{% block main_box_title %}User applications - {{ user.name }}{% endblock %} +{% block main_box_title %}User applications - {{ acc_user.name }}{% endblock %} {% block main_box_body %}