修改sudo授权

jperm/models.py

@@ -11,21 +11,14 @@ class Perm(models.Model):
         return '%s_%s' % (self.user_group.name, self.asset_group.name)
 
 
-class CMD(models.Model):
-    cmd = models.CharField(max_length=200)
-
-
 class CmdGroup(models.Model):
     name = models.CharField(max_length=50)
-    cmd = models.ForeignKey(CMD)
+    cmd = models.CharField(max_length=999)
     comment = models.CharField(blank=True, null=True, max_length=50)
 
 
 class SudoPerm(models.Model):
-    user = models.CharField(max_length=100)
-    is_user_group = models.BooleanField(default=False)
-    asset = models.CharField(max_length=100)
-    is_asset_group = models.BooleanField(default=False)
-    cmd = models.CharField(max_length=200)
+    user_group = models.ManyToManyField(UserGroup)
+    asset_group = models.ManyToManyField(BisGroup)
+    cmd_group = models.ManyToManyField(CmdGroup)
+    comment = models.CharField(max_length=30)
\ No newline at end of file
-    is_cmd_group = models.BooleanField(default=False)
-

jperm/urls.py

@@ -12,4 +12,5 @@ urlpatterns = patterns('jperm.views',
     (r'^perm_detail/$', 'perm_detail'),
     (r'^perm_del/$', 'perm_del'),
     (r'^perm_asset_detail/$', 'perm_asset_detail'),
+    (r'^sudo_list/$', 'sudo_list'),
 )

jperm/views.py

@@ -4,7 +4,7 @@ from django.shortcuts import render_to_response
 from django.http import HttpResponseRedirect, HttpResponse
 from juser.models import User, UserGroup
 from jasset.models import Asset, BisGroup
-from jperm.models import Perm
+from jperm.models import Perm, SudoPerm
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 
 
@@ -137,3 +137,23 @@ def perm_asset_detail(request):
     return render_to_response('jperm/perm_asset_detail.html', locals())
 
 
+def sudo_list(request):
+    header_title, path1, path2 = u'Sudo授权 | Perm Sudo Detail.', u'jperm', u'sudo_list'
+    sudo_perms = contact_list = SudoPerm.objects.all()
+    users = contact_list2 = User.objects.all().order_by('id')
+    p = paginator = Paginator(contact_list, 10)
+    p2 = paginator2 = Paginator(contact_list2, 10)
+    try:
+        page = int(request.GET.get('page', '1'))
+    except ValueError:
+        page = 1
+
+    try:
+        contacts = paginator.page(page)
+        contacts2 = paginator2.page(page)
+    except (EmptyPage, InvalidPage):
+        contacts = paginator.page(paginator.num_pages)
+        contacts2 = paginator2.page(paginator2.num_pages)
+    return render_to_response('jperm/sudo_list.html', locals())
+
+

templates/nav.html

@@ -33,7 +33,7 @@
                 <a href="#"><i class="fa fa-edit"></i> <span class="nav-label">授权管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
                     <li id="perm_list"><a href="/jperm/perm_list/">主机授权</a></li>
-                    <li id="perm_sudo"><a href="/jperm/perm_sudo/">Sudo授权</a></li>
+                    <li id="perm_sudo"><a href="/jperm/sudo_list/">Sudo授权</a></li>
                 </ul>
             </li>
             <li id="jlog">