diff options
| -rw-r--r-- | lib/orm/models.py | 7 | ||||
| -rw-r--r-- | lib/srtgui/templates/base.html | 2 | ||||
| -rw-r--r-- | lib/srtgui/views.py | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lib/orm/models.py b/lib/orm/models.py index b7026891..3a4a39a7 100644 --- a/lib/orm/models.py +++ b/lib/orm/models.py @@ -772,6 +772,10 @@ class Access(): v.value = User.USER_GUEST v.save() self.current_user = int(v.value) + try: + self.current_user_name = User.objects.get(pk=self.current_user).name + except: + self.current_user_name = '<not_found>' v, created = SrtSetting.objects.get_or_create(name='current_user_access') if created: @@ -794,6 +798,9 @@ class Access(): def is_admin(self): self.read_values() return self.current_user_access >= User.ADMIN + def user_name(self): + self.read_values() + return self.current_user_name # Database Cache Support diff --git a/lib/srtgui/templates/base.html b/lib/srtgui/templates/base.html index 42683fd0..3cc98a49 100644 --- a/lib/srtgui/templates/base.html +++ b/lib/srtgui/templates/base.html @@ -182,7 +182,7 @@ window.onclick = function(event) { {% if access.is_guest %} <a class="btn btn-default navbar-btn navbar-right" id="login-button" href="{% url 'login_admin' %}">Login (Guest)</a> {% else %} - <a class="btn btn-default navbar-btn navbar-right" id="login-button" href="{% url 'login_guest' %}">Logout (Manager)</a> + <a class="btn btn-default navbar-btn navbar-right" id="login-button" href="{% url 'login_guest' %}">Logout ({{access.user_name}})</a> {% endif %} <div class="dropdown navbar-right"> diff --git a/lib/srtgui/views.py b/lib/srtgui/views.py index 780160fc..48556b3b 100644 --- a/lib/srtgui/views.py +++ b/lib/srtgui/views.py @@ -503,15 +503,15 @@ def cve(request, cve_pk, active_tab="1"): cve_summary = copy.copy(cve_object) cve_summary.source = 'Summary' - cve_wr = Cve - cve_wr.source = 'WR' + cve_local = Cve + cve_local.source = 'Local' context = { 'object' : { "name" : "CVE-1234"} , 'cve_list_table' : [ (cve_summary,tab_states['1'],"Summary"), (cve_object,tab_states['2'],"NIST"), - (cve_wr,tab_states['3'],"Wind_River"), + (cve_local,tab_states['3'],"Local"), ], 'tab_states' : tab_states, 'response_link' : response_link, @@ -592,7 +592,7 @@ def login_guest(request): return redirect(landing) def login_admin(request): current_user = SrtSetting.objects.get_or_create(name='current_user')[0] - current_user.value = 16 + current_user.value = 3 current_user.save() current_user_access = SrtSetting.objects.get_or_create(name='current_user_access')[0] current_user_access.value = User.ADMIN |