permission user search

apps/assets/templates/assets/asset_group_detail.html

@@ -33,10 +33,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>
@@ -78,10 +74,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>

apps/assets/templates/assets/system_user_asset.html

@@ -39,10 +39,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>

apps/assets/templates/assets/system_user_asset_group.html

@@ -40,10 +40,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>

apps/assets/templates/assets/system_user_detail.html

@@ -42,10 +42,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>

apps/common/utils.py

@@ -2,6 +2,8 @@
 #
 
 from __future__ import unicode_literals
+from itertools import chain
+import string
 
 from django.shortcuts import reverse as dj_reverse
 from django.conf import settings
@@ -39,4 +41,45 @@ def date_expired_default():
     except TypeError:
         years = 70
 
-    return timezone.now() + timezone.timedelta(days=365 * years)
+    return timezone.now() + timezone.timedelta(days=365 * years)
\ No newline at end of file
+
+
+def combine_seq(s1, s2, callback=None):
+    for s in (s1, s2):
+        if not hasattr(s, '__iter__'):
+            return []
+
+    seq = chain(s1, s2)
+    if callback:
+        seq = map(callback, seq)
+
+    return seq
+
+
+def search_object_attr(obj, value='', attr_list=None, ignore_case=False):
+    try:
+        object_attr = obj.__dict__
+    except AttributeError:
+        return False
+
+    if not isinstance(value, str):
+        return False
+
+    if value == '':
+        return True
+
+    if attr_list is not None:
+        for attr in attr_list:
+            object_attr.pop(attr)
+
+    print(value)
+    print(object_attr)
+    if ignore_case:
+        if value.lower() in map(string.lower, filter(lambda x: isinstance(x, (str, unicode)), object_attr.values())):
+            return True
+    else:
+        if value in object_attr.values():
+            return True
+    return False
+
+

apps/perms/models.py

 from __future__ import unicode_literals, absolute_import
+import functools
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
@@ -6,7 +7,7 @@ from django.utils import timezone
 
 from users.models import User, UserGroup
 from assets.models import Asset, AssetGroup, SystemUser
-from common.utils import date_expired_default
+from common.utils import date_expired_default, combine_seq
 
 
 class AssetPermission(models.Model):
@@ -16,8 +17,8 @@ class AssetPermission(models.Model):
     )
 
     name = models.CharField(max_length=128, verbose_name=_('Name'))
-    users = models.ManyToManyField(User, related_name='asset_permissions')
-    user_groups = models.ManyToManyField(UserGroup, related_name='asset_permissions')
+    users = models.ManyToManyField(User, related_name='asset_permissions', blank=True)
+    user_groups = models.ManyToManyField(UserGroup, related_name='asset_permissions', blank=True)
     assets = models.ManyToManyField(Asset, related_name='granted_by_permissions', blank=True)
     asset_groups = models.ManyToManyField(AssetGroup, related_name='granted_by_permissions', blank=True)
     system_users = models.ManyToManyField(SystemUser, related_name='granted_by_permissions')
@@ -37,6 +38,33 @@ class AssetPermission(models.Model):
             return True
         return True
 
+    @staticmethod
+    def set_inherit(obj):
+        setattr(obj, 'inherited', True)
+        return obj
+
+    def get_granted_users(self):
+        return list(set(self.users.all() or []) | set(self.get_granted_user_groups_member()))
+
+    def get_granted_user_groups_member(self):
+        combine_users = functools.partial(combine_seq, callback=AssetPermission.set_inherit)
+        try:
+            return functools.reduce(combine_users, [user_group.users.all()
+                                                    for user_group in self.user_groups.iterator()])
+        except TypeError:
+            return []
+
+    def get_granted_assets(self):
+        return list(self.assets.all() or []) | set(self.get_granted_asset_groups_member())
+
+    def get_granted_asset_groups_member(self):
+        combine_assets = functools.partial(combine_seq, callback=AssetPermission.set_inherit)
+        try:
+            return functools.reduce(combine_assets, [asset_group.users.all()
+                                                     for asset_group in self.asset_groups.iterator()])
+        except TypeError:
+            return []
+
     class Meta:
         db_table = 'asset_permission'
 

apps/perms/templates/perms/asset_permission_detail.html

@@ -43,10 +43,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>

apps/perms/templates/perms/asset_permission_user_list.html

@@ -28,6 +28,16 @@
                                 <a href="{% url 'perms:asset-permission-asset-list' pk=asset_permission.id  %}" class="text-center">
                                 <i class="fa fa-bar-chart-o"></i> {% trans 'Assets and asset gruops' %}</a>
                             </li>
+                            <form id="search_form" method="get" action="" class="pull-right mail-search">
+                            <div class="input-group">
+                                <input type="text" class="form-control input-sm" name="keyword" placeholder="Search" value="">
+                                <div class="input-group-btn">
+                                    <button id="search_btn" type="submit" class="btn btn-sm btn-primary">
+                                        搜索
+                                    </button>
+                                </div>
+                            </div>
+                            </form>
                         </ul>
                     </div>
                     <div class="tab-content">
@@ -43,10 +53,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>
@@ -60,7 +66,8 @@
                                                 <th>{% trans 'Name' %}</th>
                                                 <th>{% trans 'Username' %}</th>
                                                 <th>{% trans 'Email' %}</th>
-                                                <th>{% trans 'Active' %}</th>
+                                                <th>{% trans 'Is valid' %}</th>
+                                                <th></th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -77,6 +84,9 @@
                                                     {% endif %}
                                                 </td>
 
+                                                <td>
+                                                    <button class="btn btn-danger btn-xs btn_delete_user_group {% if user.inherited %} disabled {% endif %}" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
+                                                </td>
                                             </tr>
                                             {% endfor %}
                                         </tbody>

apps/perms/views.py

 # ~*~ coding: utf-8 ~*~
 
 from __future__ import unicode_literals, absolute_import
+import functools
 
 from django.utils.translation import ugettext as _
 from django.conf import settings
@@ -11,6 +12,7 @@ from django.urls import reverse_lazy
 from django.contrib.messages.views import SuccessMessageMixin
 from django.views.generic.detail import DetailView, SingleObjectMixin
 
+from common.utils import search_object_attr
 from .hands import AdminUserRequiredMixin, User, UserGroup, SystemUser
 from .models import AssetPermission
 from .forms import AssetPermissionForm
@@ -124,10 +126,19 @@ class AssetPermissionUserListView(AdminUserRequiredMixin, SingleObjectMixin, Lis
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object(queryset=AssetPermission.objects.all())
+        self.keyword = keyword = self.request.GET.get('keyword', '')
         return super(AssetPermissionUserListView, self).get(request, *args, **kwargs)
 
     def get_queryset(self):
-        return self.object.users.all()
+        print(self.keyword)
+        queryset = self.object.get_granted_users()
+
+        if self.keyword:
+            search_func = functools.partial(search_object_attr, value=self.keyword,
+                                            attr_list=['name', 'username', 'email'],
+                                            ignore_case=True)
+            queryset = filter(search_func, queryset[:])
+        return queryset
 
     def get_context_data(self, **kwargs):
         context = {

apps/users/templates/users/user_detail.html

@@ -34,10 +34,6 @@
                                             <i class="fa fa-wrench"></i>
                                         </a>
                                         <ul class="dropdown-menu dropdown-user">
-                                            <li><a href="#"></a>
-                                            </li>
-                                            <li><a href="#"></a>
-                                            </li>
                                         </ul>
                                         <a class="close-link">
                                             <i class="fa fa-times"></i>