diff --git a/apps/perms/api.py b/apps/perms/api.py index 92cfa23d5..e9f91b49c 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -2,8 +2,17 @@ # from rest_framework.views import APIView, Response -from users.backends import IsValidUser +from rest_framework.generics import ListCreateAPIView +from users.backends import IsValidUser, IsSuperUser from .utils import get_user_granted_assets, get_user_granted_asset_groups +from .models import AssetPermission +from . import serializers + + +class AssetPermissionListCreateApi(ListCreateAPIView): + queryset = AssetPermission.objects.all() + serializer_class = serializers.AssetPermissionSerializer + permission_classes = (IsSuperUser,) class UserAssetsGrantedApi(APIView): @@ -34,3 +43,26 @@ class UserAssetsGrantedApi(APIView): return Response(assets_json, status=200) + +class UserAssetsGroupsGrantedApi(APIView): + permission_classes = (IsValidUser,) + + def get(self, request, *args, **kwargs): + asset_groups = {} + user = request.user + + if user: + assets = get_user_granted_assets(user) + for asset in assets: + for asset_group in asset.groups.all(): + if asset_group.id in asset_groups: + asset_groups[asset_group.id]['asset_num'] += 1 + else: + asset_groups[asset_group.id] = { + 'id': asset_group.id, + 'name': asset_group.name, + 'asset_num': 1 + } + + asset_groups_json = asset_groups.values() + return Response(asset_groups_json, status=200) \ No newline at end of file diff --git a/apps/perms/models.py b/apps/perms/models.py index b771d086d..f1d4b4b1f 100644 --- a/apps/perms/models.py +++ b/apps/perms/models.py @@ -11,19 +11,19 @@ from common.utils import date_expired_default, combine_seq class AssetPermission(models.Model): - PRIVATE_FOR_CHOICE = ( - ('N', 'None'), - ('U', 'user'), - ('G', 'user group'), - ) + # PRIVATE_FOR_CHOICE = ( + # ('N', 'None'), + # ('U', 'user'), + # ('G', 'user group'), + # ) name = models.CharField(max_length=128, unique=True, verbose_name=_('Name')) 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') - private_for = models.CharField(choices=PRIVATE_FOR_CHOICE, max_length=1, default='N', blank=True, - verbose_name=_('Private for')) + # private_for = models.CharField(choices=PRIVATE_FOR_CHOICE, max_length=1, default='N', blank=True, + # verbose_name=_('Private for')) is_active = models.BooleanField(default=True, verbose_name=_('Active')) date_expired = models.DateTimeField(default=date_expired_default, verbose_name=_('Date expired')) created_by = models.CharField(max_length=128, blank=True, verbose_name=_('Created by')) diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py index f19a64d9a..78857cf0c 100644 --- a/apps/perms/serializers.py +++ b/apps/perms/serializers.py @@ -1,4 +1,34 @@ # -*- coding: utf-8 -*- # +from rest_framework import serializers +from .models import AssetPermission + + +class AssetPermissionSerializer(serializers.ModelSerializer): + # users_amount = serializers.SerializerMethodField() + # user_groups_amount = serializers.SerializerMethodField() + # assets_amount = serializers.SerializerMethodField() + # asset_groups_amount = serializers.SerializerMethodField() + + class Meta: + model = AssetPermission + fields = ['id', 'name', 'users', 'user_groups', 'assets', 'asset_groups', + 'system_users', 'is_active', 'comment', 'date_expired'] + + # @staticmethod + # def get_users_amount(obj): + # return obj.users.count() + # + # @staticmethod + # def get_user_groups_amount(obj): + # return obj.user_groups.count() + # + # @staticmethod + # def get_assets_amount(obj): + # return obj.assets.count() + # + # @staticmethod + # def get_asset_groups_amount(obj): + # return obj.asset_groups.count() diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 6332e2e6d..1c1b167c3 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -1,73 +1,120 @@ {% extends '_base_list.html' %} {% load i18n %} +{% load static %} {% load common_tags %} -{% block content_left_head %} - {% trans "Create permission" %} +{% block custom_head_css_js %} + {{ block.super }} + +{% endblock %} +{% block table_search %}{% endblock %} +{% block table_container %} +
+ {% trans "Create permission" %} +
+ + + + + + + + + + + + + + +
+
+ +
+ 		{% trans 'Name' %}{% trans 'User' %}{% trans 'User group' %}{% trans 'Asset' %}{% trans 'Asset group' %}{% trans 'System user' %}{% trans 'Is valid' %}{% trans 'Action' %}
{% endblock %} -{% block table_head %} - - - - {% trans 'Name' %} - {% trans 'User count' %} - {% trans 'User group count' %} - {% trans 'Asset count' %} - {% trans 'Asset group count' %} - {% trans 'System user count' %} - {% trans 'Is valid' %} - -{% endblock %} +{% block custom_foot_js %} + {% endblock %} diff --git a/apps/perms/urls.py b/apps/perms/urls.py index 33681da6d..e44177915 100644 --- a/apps/perms/urls.py +++ b/apps/perms/urls.py @@ -22,7 +22,11 @@ urlpatterns = [ ] urlpatterns += [ + url(r'^v1/asset-permission/$', api.AssetPermissionListCreateApi.as_view(), + name='asset-permission-list-create-api'), url(r'^v1/user/assets/granted/$', api.UserAssetsGrantedApi.as_view(), name='user-assets-granted'), + url(r'^v1/user/asset-groups/granted/$', api.UserAssetsGroupsGrantedApi.as_view(), + name='user-asset-groups-granted'), ] diff --git a/apps/perms/views.py b/apps/perms/views.py index f3704a3d1..546eff80b 100644 --- a/apps/perms/views.py +++ b/apps/perms/views.py @@ -34,7 +34,6 @@ class AssetPermissionListView(AdminUserRequiredMixin, ListView): return super(AssetPermissionListView, self).get_context_data(**kwargs) def get_queryset(self): - # Todo: Default order by lose asset connection num self.queryset = super(AssetPermissionListView, self).get_queryset() self.keyword = keyword = self.request.GET.get('keyword', '') self.sort = sort = self.request.GET.get('sort', '-date_created') diff --git a/apps/users/backends.py b/apps/users/backends.py index bb2bf597b..00061bdec 100644 --- a/apps/users/backends.py +++ b/apps/users/backends.py @@ -81,8 +81,7 @@ class AccessTokenAuthentication(authentication.BaseAuthentication): user = get_object_or_none(User, id=user_id) if not user: - msg = _('Invalid token') - raise exceptions.AuthenticationFailed(msg) + return None remote_addr = request.META.get('REMOTE_ADDR', '') remote_addr = base64.b16encode(remote_addr).replace('=', '') diff --git a/apps/users/forms.py b/apps/users/forms.py index 4df402d57..08c14f860 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -108,7 +108,7 @@ class UserPrivateAssetPermissionForm(forms.ModelForm): def save(self, commit=True): self.instance = super(UserPrivateAssetPermissionForm, self).save(commit=commit) - self.instance.private_for = 'U' + # self.instance.private_for = 'U' self.instance.users = [self.user] self.instance.save() return self.instance @@ -116,7 +116,7 @@ class UserPrivateAssetPermissionForm(forms.ModelForm): class Meta: model = AssetPermission fields = [ - 'assets', 'asset_groups', 'system_users', 'private_for', 'name', + 'assets', 'asset_groups', 'system_users', 'name', ] widgets = { 'assets': forms.SelectMultiple(attrs={'class': 'select2',