frontend sidebar Revision

accounts/forms.py

@@ -159,6 +159,9 @@ class Meta:
         widgets = {
             'name': forms.TextInput(attrs={'class': 'form-control'}),
             'permission': forms.SelectMultiple(attrs={'class': 'form-control', 'size':'10', 'multiple': 'multiple'}),
+            'webssh': forms.SelectMultiple(attrs={'class': 'form-control', 'size':'10', 'multiple': 'multiple'}),
+            'delivery': forms.SelectMultiple(attrs={'class': 'form-control', 'size':'10', 'multiple': 'multiple'}),
+
         }
 
     def __init__(self,*args,**kwargs):
@@ -167,6 +170,10 @@ def __init__(self,*args,**kwargs):
         self.fields['name'].error_messages = {'required': u'请输入名称'}
         self.fields['permission'].label = u'URL'
         self.fields['permission'].required = False
+        self.fields['webssh'].label = u'授权组'
+        self.fields['webssh'].required = False
+        self.fields['delivery'].label = u'授权部署'
+        self.fields['delivery'].required = False
 
 
 class PermissionListForm(forms.ModelForm):

accounts/models.py

@@ -2,6 +2,8 @@
 
 from django.db import models
 from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
+from cmdb.models import HostGroup
+from delivery.models import Delivery
 # Create your models here.
 
 
@@ -17,6 +19,8 @@ class RoleList(models.Model):
     name = models.CharField(max_length=64)
     # permission = models.ManyToManyField(PermissionList, null=True, blank=True)
     permission = models.ManyToManyField(PermissionList, blank=True)
+    webssh = models.ManyToManyField(HostGroup, blank=True)
+    delivery = models.ManyToManyField(Delivery, blank=True)
 
     def __unicode__(self):
         return self.name

accounts/permission.py

@@ -50,9 +50,7 @@ def _wrapped_view(request, *args, **kwargs):
 
 @login_required
 def permission_deny(request):
-    temp_name = "main-header.html"
     kwvars = {
-        'temp_name': temp_name,
         'request': request,
     }
 
@@ -62,7 +60,6 @@ def permission_deny(request):
 @login_required
 @permission_verify()
 def permission_add(request):
-    temp_name = "accounts/accounts-header.html"
     if request.method == "POST":
         form = PermissionListForm(request.POST)
         if form.is_valid():
@@ -72,7 +69,6 @@ def permission_add(request):
         form = PermissionListForm()
 
     kwvars = {
-        'temp_name': temp_name,
         'form': form,
         'request': request,
     }
@@ -84,14 +80,12 @@ def permission_add(request):
 @permission_verify()
 def permission_list(request):
     all_permission = PermissionList.objects.all()
-    temp_name = "accounts/accounts-header.html"
     return render(request, 'accounts/permission_list.html', locals())
 
 
 @login_required
 @permission_verify()
 def permission_edit(request, ids):
-    temp_name = "accounts/accounts-header.html"
     iPermission = PermissionList.objects.get(id=ids)
 
     if request.method == "POST":
@@ -103,7 +97,6 @@ def permission_edit(request, ids):
         form = PermissionListForm(instance=iPermission)
 
     kwvars = {
-        'temp_name': temp_name,
         'ids': ids,
         'form': form,
         'request': request,
@@ -123,14 +116,20 @@ def permission_del(request, ids):
 @login_required
 def get_user_permission(request):
     ret = []
+    data_final = []
     iUser = UserInfo.objects.get(username=request.user)
     try:
         role_permission = RoleList.objects.get(name=iUser.role)
         role_permission_list = role_permission.permission.all()
         for p in role_permission_list:
-            d = p.name
+            d = p.url
             ret.append(d.encode('ascii'))
     except:
-        data = "Role list is empty"
+        all_perms = "Role list is empty"
     data = ",".join(ret)
-    return HttpResponse(str(data))
+    data_m = data.split("/")
+    for n in data_m:
+        if n != ',' and n:
+            data_final.append(n)
+    all_perms = ",".join(set(data_final))
+    return HttpResponse(str(all_perms))

accounts/role.py

@@ -13,7 +13,6 @@
 @login_required
 @permission_verify()
 def role_add(request):
-    temp_name = "accounts/accounts-header.html"
     if request.method == "POST":
         form = RoleListForm(request.POST)
         if form.is_valid():
@@ -23,7 +22,6 @@ def role_add(request):
         form = RoleListForm()
 
     kwvars = {
-        'temp_name': temp_name,
         'form': form,
         'request': request,
     }
@@ -34,7 +32,6 @@ def role_add(request):
 @login_required
 @permission_verify()
 def role_list(request):
-    temp_name = "accounts/accounts-header.html"
     all_role = RoleList.objects.all()
     return render(request, 'accounts/role_list.html', locals())
 
@@ -43,7 +40,6 @@ def role_list(request):
 @permission_verify()
 def role_edit(request, ids):
     iRole = RoleList.objects.get(id=ids)
-    temp_name = "accounts/accounts-header.html"
     if request.method == "POST":
         form = RoleListForm(request.POST, instance=iRole)
         if form.is_valid():
@@ -53,7 +49,6 @@ def role_edit(request, ids):
         form = RoleListForm(instance=iRole)
 
     kwvars = {
-        'temp_name': temp_name,
         'ids': ids,
         'form': form,
         'request': request,

accounts/urls.py

@@ -8,21 +8,21 @@
     # url(r'^$', user.user_list, name='accounts'),
     url(r'^login/$', user.login, name='login'),
     url(r'^logout/$', user.logout, name='logout'),
-    url(r'^user/list/$', user.user_list, name='user_list'),
-    url(r'^user/add/$', user.user_add, name='user_add'),
-    url(r'^user/delete/(?P<ids>\d+)/$', user.user_del, name='user_del'),
-    url(r'^user/edit/(?P<ids>\d+)/$', user.user_edit, name='user_edit'),
-    url(r'^reset/password/(?P<ids>\d+)/$', user.reset_password, name='reset_password'),
-    url(r'^change/password/$', user.change_password, name='change_password'),
-    url(r'^change/ldap/password/$', user.change_ldap, name='change_ldap_password'),
-    url(r'^role/add/$', role.role_add, name='role_add'),
-    url(r'^role/list/$', role.role_list, name='role_list'),
-    url(r'^role/edit/(?P<ids>\d+)/$', role.role_edit, name='role_edit'),
-    url(r'^role/delete/(?P<ids>\d+)/$', role.role_del, name='role_del'),
-    url(r'^permission/deny/$', permission.permission_deny, name='permission_deny'),
-    url(r'^permission/add/$', permission.permission_add, name='permission_add'),
-    url(r'^permission/list/$', permission.permission_list, name='permission_list'),
-    url(r'^permission/edit/(?P<ids>\d+)/$', permission.permission_edit, name='permission_edit'),
-    url(r'^permission/delete/(?P<ids>\d+)/$', permission.permission_del, name='permission_del'),
+    url(r'^userlist/$', user.user_list, name='user_list'),
+    url(r'^useradd/$', user.user_add, name='user_add'),
+    url(r'^userdelete/(?P<ids>\d+)/$', user.user_del, name='user_del'),
+    url(r'^useredit/(?P<ids>\d+)/$', user.user_edit, name='user_edit'),
+    url(r'^resetpassword/(?P<ids>\d+)/$', user.reset_password, name='reset_password'),
+    url(r'^changepassword/$', user.change_password, name='change_password'),
+    url(r'^changeldappassword/$', user.change_ldap, name='change_ldap_password'),
+    url(r'^roleadd/$', role.role_add, name='role_add'),
+    url(r'^rolelist/$', role.role_list, name='role_list'),
+    url(r'^roleedit/(?P<ids>\d+)/$', role.role_edit, name='role_edit'),
+    url(r'^roledelete/(?P<ids>\d+)/$', role.role_del, name='role_del'),
+    url(r'^permdeny/$', permission.permission_deny, name='permission_deny'),
+    url(r'^permadd/$', permission.permission_add, name='permission_add'),
+    url(r'^permlist/$', permission.permission_list, name='permission_list'),
+    url(r'^permedit/(?P<ids>\d+)/$', permission.permission_edit, name='permission_edit'),
+    url(r'^permdelete/(?P<ids>\d+)/$', permission.permission_del, name='permission_del'),
     url(r'^permission/user_permission/$', permission.get_user_permission, name='get_user_permission'),
 ]

accounts/user.py

@@ -45,10 +45,8 @@ def logout(request):
 @login_required()
 @permission_verify()
 def user_list(request):
-    temp_name = "accounts/accounts-header.html"
     all_user = get_user_model().objects.all()
     kwargs = {
-        'temp_name': temp_name,
         'all_user':  all_user,
     }
     return render(request, 'accounts/user_list.html', kwargs)
@@ -57,7 +55,6 @@ def user_list(request):
 @login_required
 @permission_verify()
 def user_add(request):
-    temp_name = "accounts/accounts-header.html"
     if request.method == 'POST':
         form = AddUserForm(request.POST)
         if form.is_valid():
@@ -70,7 +67,6 @@ def user_add(request):
     kwargs = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
     }
     return render(request, 'accounts/user_add.html', kwargs)
 
@@ -118,7 +114,6 @@ def reset_password(request, ids):
 
 @login_required
 def change_password(request):
-    temp_name = "accounts/accounts-header.html"
     if request.method == 'POST':
         form = ChangePasswordForm(user=request.user, data=request.POST)
         if form.is_valid():
@@ -129,14 +124,12 @@ def change_password(request):
     kwargs = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
     }
     return render(request, 'accounts/change_password.html', kwargs)
 
 
 @login_required
 def change_ldap(request):
-    temp_name = "accounts/accounts-header.html"
     if request.method == 'POST':
         form = ChangeLdapPasswordForm(user=request.user, data=request.POST)
         if form.is_valid():
@@ -148,6 +141,5 @@ def change_ldap(request):
     kwargs = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
     }
     return render(request, 'accounts/change_ldap_password.html', kwargs)

appconf/appowner.py

@@ -12,10 +12,8 @@
 @login_required()
 @permission_verify()
 def appowner_list(request):
-    temp_name = "appconf/appconf-header.html"
     all_app_owner = AppOwner.objects.all()
     results = {
-        'temp_name': temp_name,
         'all_app_owner':  all_app_owner,
     }
     return render(request, 'appconf/appowner_list.html', results)
@@ -39,7 +37,6 @@ def appowner_del(request):
 @login_required
 @permission_verify()
 def appowner_add(request):
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = AppOwnerForm(request.POST)
         if form.is_valid():
@@ -51,7 +48,6 @@ def appowner_add(request):
     results = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
         'page_type': "whole"
     }
     return render(request, 'appconf/appowner_add_edit.html', results)
@@ -90,7 +86,6 @@ def appowner_add_mini(request):
 @permission_verify()
 def appowner_edit(request, appowner_id, mini=False):
     appowner = AppOwner.objects.get(id=appowner_id)
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = AppOwnerForm(request.POST, instance=appowner)
         if form.is_valid():
@@ -103,7 +98,6 @@ def appowner_edit(request, appowner_id, mini=False):
         'form': form,
         'appowner_id': appowner_id,
         'request': request,
-        'temp_name': temp_name,
         'page_type': "whole"
     }
     return render(request, 'appconf/appowner_add_edit.html', results)

appconf/authinfo.py

@@ -12,10 +12,8 @@
 @login_required()
 @permission_verify()
 def authinfo_list(request):
-    temp_name = "appconf/appconf-header.html"
     all_authinfo = AuthInfo.objects.all()
     results = {
-        'temp_name': temp_name,
         'all_authinfo':  all_authinfo,
     }
     return render(request, 'appconf/authinfo_list.html', results)
@@ -37,7 +35,6 @@ def authinfo_del(request):
 @login_required
 @permission_verify()
 def authinfo_add(request):
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = AuthInfoForm(request.POST)
         if form.is_valid():
@@ -49,7 +46,6 @@ def authinfo_add(request):
     results = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
         'page_type': "whole"
     }
     return render(request, 'appconf/authinfo_add_edit.html', results)
@@ -88,7 +84,6 @@ def authinfo_add_mini(request):
 @permission_verify()
 def authinfo_edit(request, authinfo_id, mini=False):
     authinfo = AuthInfo.objects.get(id=authinfo_id)
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = AuthInfoForm(request.POST, instance=authinfo)
         if form.is_valid():
@@ -101,7 +96,6 @@ def authinfo_edit(request, authinfo_id, mini=False):
         'form': form,
         'authinfo_id': authinfo_id,
         'request': request,
-        'temp_name': temp_name,
         'page_type': "whole"
     }
     return render(request, 'appconf/authinfo_add_edit.html', results)

appconf/product.py

@@ -12,10 +12,8 @@
 @login_required()
 @permission_verify()
 def product_list(request):
-    temp_name = "appconf/appconf-header.html"
     all_product = Product.objects.all()
     results = {
-        'temp_name': temp_name,
         'all_product':  all_product,
     }
     return render(request, 'appconf/product_list.html', results)
@@ -39,7 +37,6 @@ def product_del(request):
 @login_required
 @permission_verify()
 def product_add(request):
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = ProductForm(request.POST)
         if form.is_valid():
@@ -51,7 +48,6 @@ def product_add(request):
     results = {
         'form': form,
         'request': request,
-        'temp_name': temp_name,
     }
     return render(request, 'appconf/product_base.html', results)
 
@@ -60,7 +56,6 @@ def product_add(request):
 @permission_verify()
 def product_edit(request, product_id):
     product = Product.objects.get(id=product_id)
-    temp_name = "appconf/appconf-header.html"
     if request.method == 'POST':
         form = ProductForm(request.POST, instance=product)
         if form.is_valid():
@@ -73,19 +68,16 @@ def product_edit(request, product_id):
         'form': form,
         'product_id': product_id,
         'request': request,
-        'temp_name': temp_name,
     }
     return render(request, 'appconf/product_base.html', results)
 
 
 @login_required
 @permission_verify()
 def project_list(request, product_id):
-    temp_name = "appconf/appconf-header.html"
     product = Product.objects.get(id=product_id)
     projects = product.project_set.all()
     results = {
-        'temp_name': temp_name,
         'project_list':  projects,
     }
     return render(request, 'appconf/product_project_list.html', results)