global perm check review #41 / add username on top of each view #64

vycontrol/firewall/templates/firewall/addressgroup-add.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall Add New Address Group{% endblock %}
 {% block section_title %}Firewall Add New Address Group{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {% endblock %}

vycontrol/firewall/templates/firewall/addressgroup-list.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall Group List{% endblock %}
 {% block section_title %}Firewall Group List{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall_addressgroup }}

vycontrol/firewall/templates/firewall/addrule.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall {{firewall_name}}{% endblock %}
 {% block section_title %}<a href="{% url 'firewall:show' firewall_name %}">Firewall {{firewall_name}}</a> - create new rule{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall }}

vycontrol/firewall/templates/firewall/create.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Create Firewall{% endblock %}
 {% block section_title %}Create Firewall{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall_all }}

vycontrol/firewall/templates/firewall/edit.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Edit Firewall{% endblock %}
 {% block section_title %}Edit Firewall{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall_all }}

vycontrol/firewall/templates/firewall/editrule.html

@@ -1,10 +1,8 @@
 {% extends "base.html" %}
 
-
-
-
 {% block header_title %}Firewall Dashboard{% endblock %}
 {% block section_title %}Firewall Dashboard{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall }}

vycontrol/firewall/templates/firewall/networkgroup-add.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall Add New Address Group{% endblock %}
 {% block section_title %}Firewall Add New Address Group{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {% endblock %}

vycontrol/firewall/templates/firewall/networkgroup-list.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall Group List{% endblock %}
 {% block section_title %}Firewall Group List{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall_networkgroup }}

vycontrol/firewall/templates/firewall/show.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Firewall {{firewall_name}}{% endblock %}
 {% block section_title %}<a href="{% url 'firewall:show' firewall_name %}">Firewall {{firewall_name}}</a>{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ firewall }}

vycontrol/firewall/views.py

@@ -68,6 +68,7 @@ def create(request):
         #'interfaces': interfaces,
         'instances': all_instances,
         'hostname_default': hostname_default,
+        'username': request.user,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -118,6 +119,7 @@ def addrule(request, firewall_name):
         'hostname_default': hostname_default,
         'firewall':  firewall,
         'firewall_name': firewall_name,
+        'username': request.user,
     }  
     return HttpResponse(template.render(context, request))
 
@@ -182,7 +184,8 @@ def editrule(request, firewall_name, firewall_rulenumber):
         'firewall':  firewall,
         'firewall_name': firewall_name,
         'firewall_rule': firewall_rule,
-        'firewall_rulenumber' : firewall_rulenumber
+        'firewall_rulenumber' : firewall_rulenumber,
+        'username': request.user,
     }  
     return HttpResponse(template.render(context, request))
 
@@ -204,6 +207,7 @@ def show(request, firewall_name):
         'hostname_default': hostname_default,
         'firewall':  firewall,
         'firewall_name': firewall_name,
+        'username': request.user,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -212,10 +216,15 @@ def firewall_networkgroup_list(request):
         
     hostname_default = vyos.get_hostname_prefered(request)
     firewall_networkgroup = vyos.get_firewall_networkgroup(hostname_default)
+    all_instances = vyos.instance_getall_by_group(request)
+
 
     template = loader.get_template('firewall/networkgroup-list.html')
     context = { 
         'firewall_networkgroup': firewall_networkgroup,
+        'hostname_default': hostname_default,
+        'username': request.user, 
+        'instances': all_instances,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -224,6 +233,8 @@ def firewall_networkgroup_list(request):
 @is_authenticated
 def firewall_networkgroup_add(request):
     hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = vyos.instance_getall_by_group(request)
+
 
     if request.POST.get('name', None) != None and request.POST.get('network', None) != None:
         vyos.set_firewall_networkgroup_add(hostname_default, request.POST.get('name'), request.POST.get('network'))
@@ -237,6 +248,9 @@ def firewall_networkgroup_add(request):
 
     template = loader.get_template('firewall/networkgroup-add.html')
     context = { 
+        'hostname_default': hostname_default,
+        'username': request.user,        
+        'instances': all_instances,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -246,10 +260,15 @@ def firewall_addressgroup_list(request):
         
     hostname_default = vyos.get_hostname_prefered(request)
     firewall_addressgroup = vyos.get_firewall_addressgroup(hostname_default)
+    all_instances = vyos.instance_getall_by_group(request)
+
 
     template = loader.get_template('firewall/addressgroup-list.html')
     context = { 
         'firewall_addressgroup': firewall_addressgroup,
+        'hostname_default': hostname_default,
+        'username': request.user,        
+        'instances': all_instances,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -258,6 +277,8 @@ def firewall_addressgroup_list(request):
 def firewall_addressgroup_add(request):
         
     hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = vyos.instance_getall_by_group(request)
+
 
     if request.POST.get('addresstype', None) == "single" and request.POST.get('name', None) != None and request.POST.get('address', None) != None:
         vyos.set_firewall_addressgroup_add(hostname_default, request.POST.get('name'), request.POST.get('address'))
@@ -278,6 +299,9 @@ def firewall_addressgroup_add(request):
 
     template = loader.get_template('firewall/addressgroup-add.html')
     context = { 
+        'hostname_default': hostname_default,
+        'username': request.user,        
+        'instances': all_instances,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -302,6 +326,7 @@ def firewall_config(request, firewall_name):
         'hostname_default': hostname_default,
         'firewall':  firewall,
         'firewall_name': firewall_name,
+        'username': request.user,
     }   
     return HttpResponse(template.render(context, request))
 
@@ -369,7 +394,7 @@ def firewall_edit(request, firewall_name):
         'instances': all_instances,
         'hostname_default': hostname_default,
         'firewall_name': firewall_name,
-        'firewall': firewall
-
+        'firewall': firewall,
+        'username': request.user,
     }   
     return HttpResponse(template.render(context, request))

vycontrol/interface/templates/interface/index.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Interfaces List{% endblock %}
 {% block section_title %}Interfaces List{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
     {{ interfaces }}

vycontrol/interface/templates/interface/show.html

@@ -2,6 +2,7 @@
 
 {% block header_title %}Interface{% endblock %}
 {% block section_title %}Interface{% endblock %}
+{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ interface }}

vycontrol/interface/views.py

@@ -104,6 +104,7 @@ def index(request):
         'firewall_all' : firewall_all,
         'interface_firewall_in' : interface_firewall_in,
         'interface_firewall_out' : interface_firewall_out,
+        'username': request.user,        
     }
     return HttpResponse(template.render(context, request))
 
@@ -123,7 +124,7 @@ def interfaceshow(request, interface_type, interface_name):
         'interface_name' : interface_name,
         'hostname_default': hostname_default,
         'firewall_all' : firewall_all,
-                
+        'username': request.user,                       
     }   
     return HttpResponse(template.render(context, request))
 
@@ -144,6 +145,7 @@ def interfacefirewall(request, interface_type, interface_name):
         'hostname_default': hostname_default,
         'interface_type' : interface_type,
         'interface_name' : interface_name,        
+        'username': request.user,        
     }   
     return HttpResponse(template.render(context, request))