diff --git a/djangoldp/migrations/0003_auto_20181004_1148.py b/djangoldp/migrations/0003_auto_20181004_1148.py new file mode 100644 index 0000000000000000000000000000000000000000..789e961a1bcdf99b04ffbf261822884427de2631 --- /dev/null +++ b/djangoldp/migrations/0003_auto_20181004_1148.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-10-04 11:48 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('djangoldp', '0002_auto_20180913_1800'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ldnotification', + options={'permissions': (('view_todo', 'Read'), ('control_todo', 'Control'))}, + ), + ] diff --git a/djangoldp/serializers.py b/djangoldp/serializers.py index 8a9ed26b01290a0c741737c860896cce202305b4..673bbb3e31d50fd776409f59af428edaf0d557ae 100644 --- a/djangoldp/serializers.py +++ b/djangoldp/serializers.py @@ -87,7 +87,7 @@ class LDPSerializer(HyperlinkedModelSerializer): data = super().to_representation(obj) if hasattr(obj._meta, 'rdf_type'): data['@type'] = obj._meta.rdf_type - data['permissions'] = [{'mode': name.split('_')[0]} for name in get_perms(self.context['request'].user, obj)] + data['permissions'] = [{'mode': {'@type': name.split('_')[0]}} for name in get_perms(self.context['request'].user, obj)] return data def build_nested_field(self, field_name, relation_info, nested_depth): diff --git a/djangoldp/views.py b/djangoldp/views.py index 82a6770a2ea70bebcaae7bbd3ea54def7201af9a..2afbf4648819f8110c2ba55cb5b54ac66a01f02d 100644 --- a/djangoldp/views.py +++ b/djangoldp/views.py @@ -179,7 +179,7 @@ class LDPNestedViewSet(LDPViewSet): related_field = related_field, parent_lookup_field = cls.get_lookup_arg(**kwargs), model_prefix = cls.get_model(**kwargs)._meta.object_name.lower(), - permission_classes = kwargs.get('permission_classes'), + permission_classes = kwargs.get('permission_classes', ()), lookup_url_kwarg = related_field.related_model._meta.object_name.lower()+'_id') class LDPSourceViewSet(LDPViewSet): diff --git a/setup.py b/setup.py index 9cf256b71beb7fc98540bf245aac0f19a9b6b8a9..a42240e851f9ccb6c7691b61ebfdae04d952f9de 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name='djangoldp', - version='0.5a4', + version='0.5a5', url='https://git.happy-dev.fr/happy-dev/djangoldp/', author="Startin'blox", author_email='sylvain@happy-dev.fr',