diff --git a/CHANGES.rst b/CHANGES.rst index 2a5917dcc..3a0944b45 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,14 @@ SimPhoNy Remote CHANGELOG ========================= -What's new in SimPhoNy Remote 0.9.0 +What's new in SimPhoNy Remote 1.1.0 ----------------------------------- +- Fix: incorrect user name in top header for admin Accounting panel (#348) + +What's new in SimPhoNy Remote 0.9.0/1.0.0 +----------------------------------------- + Summary ~~~~~~~ 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/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 %}