group edit; refactoring templates

vycontrol/accounts/templates/accounts/login.html

@@ -2,9 +2,7 @@
 
 {% block header_title %}Login{% endblock %}
 {% block section_title %}Login{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/logout.html

@@ -2,9 +2,7 @@
 
 {% block header_title %}Logged out{% endblock %}
 {% block section_title %}Logged out{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/lost.html

@@ -2,9 +2,7 @@
 
 {% block header_title %}Login{% endblock %}
 {% block section_title %}Login{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/password_reset.html

@@ -1,9 +1,7 @@
 {% extends "base_not_logged.html" %}
 {% block header_title %}Password Reset{% endblock %}
 {% block section_title %}Password Reset{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/password_reset_complete.html

@@ -1,9 +1,7 @@
 {% extends "base_not_logged.html" %}
 {% block header_title %}Password Reset complete{% endblock %}
 {% block section_title %}Password Reset complete{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/password_reset_sent.html

@@ -1,9 +1,7 @@
 {% extends "base_not_logged.html" %}
 {% block header_title %}Password Reset{% endblock %}
 {% block section_title %}Password Reset{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/password_reset_token.html

@@ -1,9 +1,7 @@
 {% extends "base_not_logged.html" %}
 {% block header_title %}Change your password{% endblock %}
 {% block section_title %}Change your password{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/accounts/templates/accounts/profile.html

@@ -2,9 +2,6 @@
 
 {% block header_title %}Profile{% endblock %}
 {% block section_title %}Profile{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
 
 {% block debug %}
 {{ user }}
@@ -46,4 +43,4 @@
 
 
 
-{% endblock %}
+{% endblock %}

vycontrol/accounts/templates/accounts/start.html

@@ -2,9 +2,7 @@
 
 {% block header_title %}Installing{% endblock %}
 {% block section_title %}Installing{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
+
 
 {% block debug %}
 {% endblock %}

vycontrol/config/templates/config/group_add.html

@@ -2,7 +2,6 @@
 
 {% block header_title %}Add new group{% endblock %}
 {% block section_title %}Add new group{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block content %}
 

vycontrol/config/templates/config/group_edit.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block header_title %}dnsresolver{% endblock %}
+{% block section_title %}dnsresolver{% endblock %}
+
+{% block content %}
+
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+<form action="{% url 'config:group-edit' group %}" method="post">
+{% csrf_token %}
+
+<p>Name only accept letters, numbers and _-.</p>
+
+<p>
+    <label for="alias">Name</label><br>
+    <input type="text" name="name" id="name" value="{{ group.name }}" size="60">
+</p>
+
+
+<input type="submit" value="Edit user">
+</form>
+
+
+
+{% endblock %}
+

vycontrol/config/templates/config/groups_list.html

@@ -6,9 +6,9 @@
 {% endblock %}
 
 
-{% block header_title %}Manage groups{% endblock %}
-{% block section_title %}Manage groups{% endblock %}
-{% block username %}{{ username }}{% endblock %}
+{% block header_title %}dnsresolver{% endblock %}
+{% block section_title %}dnsresolver{% endblock %}
+
 
 {% block content %}
 
@@ -33,6 +33,7 @@
         <td>{{ group }}</td>
         <td>{% if group.active == True %}active{% else %}inactive{% endif %}</td>
         <td>
+            <a href="{% url 'config:group-edit' group %}">edit</a> | 
             {% if group.active == True %}<a href="{% url 'config:group-inactivate' group %}">inactivate</a>{% else %}<a href="{% url 'config:group-activate' group %}">activate</a>{% endif %}
         </td>
 

vycontrol/config/templates/config/instance_add.html

@@ -3,7 +3,6 @@
 
 {% block header_title %}Add new instance{% endblock %}
 {% block section_title %}Add new instance{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block content %}
 

vycontrol/config/templates/config/instance_conntry.html

@@ -2,7 +2,6 @@
 
 {% block header_title %}List instances{% endblock %}
 {% block section_title %}List instances{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block content %}
 

vycontrol/config/templates/config/instances.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
-{% block header_title %}List instances{% endblock %}
-{% block section_title %}List instances{% endblock %}
-{% block username %}{{ username }}{% endblock %}
+{% block header_title %}dnsresolver{% endblock %}
+{% block section_title %}dnsresolver{% endblock %}
+
 
 {% block debug %}
     {% for instance in instances %}

vycontrol/config/templates/config/user_add.html

@@ -2,7 +2,6 @@
 
 {% block header_title %}Add new user{% endblock %}
 {% block section_title %}Add new user{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block content %}
 

vycontrol/config/templates/config/user_edit.html

@@ -2,9 +2,6 @@
 
 {% block header_title %}User edit{% endblock %}
 {% block section_title %}User edit{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
 
 {% block debug %}
 {{ user }}

vycontrol/config/templates/config/users_list.html

@@ -7,9 +7,9 @@
 {% endblock %}
 
 
-{% block header_title %}List users{% endblock %}
-{% block section_title %}List users{% endblock %}
-{% block username %}{{ username }}{% endblock %}
+{% block header_title %}dnsresolver{% endblock %}
+{% block section_title %}dnsresolver{% endblock %}
+
 
 {% block content %}
 

vycontrol/config/urls.py

@@ -13,7 +13,7 @@ urlpatterns = [
     path('user-edit/<str:username>', views.user_edit, name='user-edit'),
     path('groups-list', views.groups_list, name='groups-list'),
     path('group-add', views.group_add, name='group-add'),
-    #path('group-edit/<str:group_name>', views.group_edit, name='group-edit'),
+    path('group-edit/<str:group_name>', views.group_edit, name='group-edit'),
     path('group-activate/<str:group_name>', views.group_activate, name='group-activate'),
     path('group-inactivate/<str:group_name>', views.group_inactivate, name='group-inactivate'),
 

vycontrol/config/views.py

@@ -397,4 +397,33 @@ def group_activate(request, group_name):
         group.active = True
         group.save()
 
-    return redirect('config:groups-list')
+    return redirect('config:groups-list')
+
+
+@perms.is_superuser
+@is_authenticated    
+def group_edit(request, group_name):
+    vinfo = viewinfo.prepare(request)
+
+    if validator_group(group_name):
+        group = Group.objects.get(name=group_name)
+
+        if request.POST.get('name', None) != None:
+            newname = request.POST.get('name').strip()
+
+            if validator_group(newname):
+                group.name = newname
+                group.save()
+            else:
+                vinfo.msg.add_error('Group name only accept letters, numbers and _-.')
+            
+    else:
+        return redirect('config:groups-list')
+
+    context = viewinfo.context(vinfo)    
+    localcontext = {
+        'group':             group
+    }
+    context.update(localcontext)
+
+    return render(request, 'config/group_edit.html', context)     

vycontrol/dnsresolver/templates/dnsresolver/add.html

@@ -2,9 +2,6 @@
 
 {% block header_title %}dnsresolver{% endblock %}
 {% block section_title %}dnsresolver{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
 
 {% block debug %}
 {% endblock %}

vycontrol/dnsresolver/templates/dnsresolver/list.html

@@ -2,10 +2,6 @@
 
 {% block header_title %}dnsresolver{% endblock %}
 {% block section_title %}dnsresolver{% endblock %}
-{% block username %}{{ username }}{% endblock %}
-{% block debugactive %}{{ debug }}{% endblock %}
-{% block creditsactive %}{{ vycontrol_credits }}{% endblock %}
-
 
 {% block debug %}
 {% endblock %}

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

@@ -2,7 +2,6 @@
 
 {% 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-desc.html

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

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

@@ -2,7 +2,6 @@
 
 {% 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/create.html

@@ -2,7 +2,6 @@
 
 {% 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,7 +2,6 @@
 
 {% 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

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

vycontrol/firewall/templates/firewall/list.html

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

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

@@ -2,7 +2,6 @@
 
 {% 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-desc.html

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

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

@@ -2,7 +2,6 @@
 
 {% 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/portgroup-add.html

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

vycontrol/firewall/templates/firewall/portgroup-edit.html

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

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

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

vycontrol/firewall/templates/firewall/show.html

@@ -2,7 +2,6 @@
 
 {% 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/templates/firewall/zones-add.html

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

vycontrol/firewall/templates/firewall/zones-addrule.html

@@ -2,7 +2,6 @@
 
 {% block header_title %}Add Firewall Ruleset to Zone{% endblock %}
 {% block section_title %}Add Firewall Ruleset to Zone{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 

vycontrol/firewall/templates/firewall/zones-edit.html

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

vycontrol/firewall/templates/firewall/zones-remove.html

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

vycontrol/firewall/templates/firewall/zones-removerule.html

@@ -2,7 +2,6 @@
 
 {% block header_title %}Remove Firewall Zone Rule{% endblock %}
 {% block section_title %}Remove Firewall Zone Rule{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 

vycontrol/firewall/templates/firewall/zones.html

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

vycontrol/interface/templates/interface/add.html

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

vycontrol/interface/templates/interface/add_vlan.html

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

vycontrol/interface/templates/interface/index.html

@@ -2,7 +2,6 @@
 
 {% 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,7 +2,6 @@
 
 {% block header_title %}Interface {{ interface_type }} {{ interface_name }}{% endblock %}
 {% block section_title %}Interface {{ interface_type }} {{ interface_name }}{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 {% block debug %}
 {{ interface }}

vycontrol/ntp/templates/ntp/add.html

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

vycontrol/ntp/templates/ntp/list.html

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

vycontrol/perms.py

@@ -57,7 +57,7 @@ def is_superuser(func):
 
         if is_admin == False:
             auth.logout(request)
-            return redirect('accounts-login')
+            return redirect('%s?next=%s' % (reverse('accounts-login'), request.path))
 
         value = func(*args, **kwargs)
         return value

vycontrol/static/templates/static/add.html

@@ -2,7 +2,7 @@
 
 {% block header_title %}Static Routes{% endblock %}
 {% block section_title %}Static Routes{% endblock %}
-{% block username %}{{ username }}{% endblock %}
+
 
 
 {% block debug %}

vycontrol/static/templates/static/list.html

@@ -4,7 +4,6 @@
 
 {% block header_title %}Static Routes{% endblock %}
 {% block section_title %}Static Routes{% endblock %}
-{% block username %}{{ username }}{% endblock %}
 
 
 {% block debug %}

vycontrol/vycontrol/templates/base.html

@@ -130,7 +130,7 @@
 </div>
 {% endif %}
 
-{% if creditsactive %}
+{% if vycontrol_credits %}
 <hr>
 <div class="container" id="credits">
   <a href="https://vycontrol.com/">VyControl</a>