matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/master_merge

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-03-14 15:57:38 -04:00
parent aaa9578047 ca7b8301a1
commit 63682a2945
44 changed files with 1810 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mayan/apps/permissions/serializers.py
View File

@@ -13,9 +13,9 @@ from .models import Role, StoredPermission
class PermissionSerializer(serializers.Serializer):
namespace = serializers.CharField()
pk = serializers.CharField()
label = serializers.CharField()
namespace = serializers.CharField(read_only=True)
pk = serializers.CharField(read_only=True)
label = serializers.CharField(read_only=True)
def to_representation(self, instance):
if isinstance(instance, StoredPermission):
@@ -33,7 +33,10 @@ class RoleSerializer(serializers.HyperlinkedModelSerializer):
permissions = PermissionSerializer(many=True, read_only=True)
class Meta:
fields = ('id', 'label', 'groups', 'permissions')
extra_kwargs = {
'url': {'view_name': 'rest_api:role-detail'},
}
fields = ('groups', 'id', 'label', 'permissions', 'url')
model = Role