delivery perms

guohongze · Jan 22, 2019 · 6a4085f · 6a4085f
1 parent 3350e8c
commit 6a4085f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/accounts/models.py b/accounts/models.py
@@ -3,7 +3,7 @@
 from django.db import models
 from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
 from cmdb.models import HostGroup
-from delivery.models import Delivery
+from appconf.models import Project
 # Create your models here.
 
 
@@ -20,7 +20,7 @@ class RoleList(models.Model):
     # 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)
+    delivery = models.ManyToManyField(Project, blank=True)
 
     def __unicode__(self):
         return self.name

diff --git a/delivery/deli.py b/delivery/deli.py
@@ -19,7 +19,12 @@
 @permission_verify()
 def delivery_list(request):
     all_project = []
-    all_project = Delivery.objects.all()
+    if request.user.is_superuser:
+        all_project = Delivery.objects.all()
+    else:
+        projects = request.user.role.delivery.all()
+        for p in projects:
+            all_project.append(Delivery.objects.get(job_name=p))
     page_len = request.GET.get('page_len', '')
     deploys_list, p, deploys, page_range, current_page, show_first, show_end, end_page = pages(all_project, request)
     return render(request, 'delivery/delivery_list.html', locals())