Add user permission user list

apps/common/templatetags/common_tags.py

@@ -32,4 +32,14 @@ def pagination_range(total_page, current_num=1, display=5):
     start = current_num - display/2 if current_num > display/2 else 1
     end = start + display if start + display <= total_page else total_page + 1
 
-    return range(start, end)
\ No newline at end of file
+    return range(start, end)
+
+
+@register.filter
+def join_attr(seq, attr=None, sep=None):
+    if sep is None:
+        sep = ', '
+    if attr is not None:
+        seq = [getattr(obj, attr) for obj in seq]
+    print(seq)
+    return sep.join(seq)

apps/users/hands.py

@@ -11,6 +11,4 @@
 """
 
 from perms.models import AssetPermission
-
-
-
+from perms.utils import get_user_granted_assets, get_user_granted_asset_groups

apps/users/templates/users/user_asset_permission.html

@@ -20,7 +20,7 @@
                                 <a href="{% url 'users:user-detail' pk=user_object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'User detail' %} </a>
                             </li>
                             <li class="active">
-                                <a href="{% url 'users:user-asset-permission' pk=user_object.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset permission list' %}</a>
+                                <a href="{% url 'users:user-asset-permission' pk=user_object.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset permission' %}</a>
                             </li>
                             <li>
                                 <a href="{% url 'users:user-granted-asset' pk=user_object.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a>

apps/users/templates/users/user_detail.html

@@ -21,7 +21,7 @@
                                 <a href="{% url 'users:user-detail' pk=user_object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'User detail' %} </a>
                             </li>
                             <li>
-                                <a href="{% url 'users:user-asset-permission' pk=user_object.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset permission list' %}</a>
+                                <a href="{% url 'users:user-asset-permission' pk=user_object.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset permission' %}</a>
                             </li>
                             <li><a href="{% url 'users:user-granted-asset' pk=user_object.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a></li>
                             <li><a href="{% url 'users:user-login-history' pk=user_object.id %}" class="text-center"><i class="fa fa-calculator-o"></i> {% trans 'Login history' %}</a></li>
@@ -193,7 +193,7 @@
                                         <tr>
                                           <td ><b class="bdg_user_group" data-gid={{ group.id }}>{{ group.name }}</b></td>
                                           <td>
-                                              <button class="btn btn-danger pull-right btn-sm btn_delete_user_group" type="button"><i class="fa fa-minus"></i></button>
+                                              <button class="btn btn-danger pull-right btn-xs btn_delete_user_group" type="button"><i class="fa fa-minus"></i></button>
                                           </td>
                                         </tr>
                                         {% endfor %}

apps/users/urls.py

@@ -20,7 +20,7 @@ urlpatterns = [
         name='user-asset-permission'),
     url(r'^user/(?P<pk>[0-9]+)/asset-permission/create$', views.UserAssetPermissionCreateView.as_view(),
         name='user-asset-permission-create'),
-    url(r'^user/(?P<pk>[0-9]+)/asset-granted', views.UserDetailView.as_view(), name='user-granted-asset'),
+    url(r'^user/(?P<pk>[0-9]+)/granted-asset', views.UserGrantedAssetView.as_view(), name='user-granted-asset'),
     url(r'^user/(?P<pk>[0-9]+)/login-history', views.UserDetailView.as_view(), name='user-login-history'),
     url(r'^first-login/$', views.UserFirstLoginView.as_view(), name='user-first-login'),
     url(r'^user/(?P<pk>[0-9]+)/assets-perm$', views.UserDetailView.as_view(), name='user-detail'),

apps/users/views.py

@@ -28,7 +28,7 @@ from .models import User, UserGroup
 from .forms import UserCreateForm, UserUpdateForm, UserGroupForm, UserLoginForm, UserInfoForm, UserKeyForm, \
     UserPrivateAssetPermissionForm
 from .utils import AdminUserRequiredMixin, user_add_success_next, send_reset_password_mail
-from .hands import AssetPermission
+from .hands import AssetPermission, get_user_granted_asset_groups, get_user_granted_assets
 
 
 logger = get_logger(__name__)
@@ -416,3 +416,26 @@ class UserAssetPermissionCreateView(AdminUserRequiredMixin, CreateView):
     def get_success_url(self):
         return reverse('users:user-asset-permission', kwargs={'pk': self.user_object.id})
 
+
+class UserGrantedAssetView(AdminUserRequiredMixin, SingleObjectMixin, ListView):
+    paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
+    template_name = 'users/user_granted_asset.html'
+    context_object_name = 'user_object'
+
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object(queryset=User.objects.all())
+        return super(UserGrantedAssetView, self).get(request, *args, **kwargs)
+
+    def get_queryset(self):
+        self.assets_granted = get_user_granted_assets(self.object)
+        return self.assets_granted.keys()
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': 'User',
+            'action': 'User granted asset',
+            'asset_groups': get_user_granted_asset_groups(self.object),
+            'assets': self.assets_granted,
+        }
+        kwargs.update(context)
+        return super(UserGrantedAssetView, self).get_context_data(**kwargs)