ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3244 from normanjaeckel/Fix3242

Browse Source 
Removed default permissions for personal note. Updated Yarn lock. Fix…
This commit is contained in:
Emanuel Schütze 2017-05-16 20:26:01 +02:00 committed by GitHub
commit d5b9a5c590
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/users/migrations/0004_personalnote.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.10.6 on 2017-04-07 14:15 # Generated by Django 1.10.7 on 2017-05-09 11:48
from __future__ import unicode_literals from __future__ import unicode_literals
import django.db.models.deletion import django.db.models.deletion
@ -25,5 +25,8 @@ class Migration(migrations.Migration):
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='personal_notes', to=settings.AUTH_USER_MODEL)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='personal_notes', to=settings.AUTH_USER_MODEL)),
], ],
options={
'default_permissions': (),
},
), ),
] ]

3
openslides/users/models.py
View File

@ -38,6 +38,9 @@ class PersonalNote(models.Model):
note = models.TextField(blank=True) note = models.TextField(blank=True)
star = models.BooleanField(default=False, blank=True) star = models.BooleanField(default=False, blank=True)
class Meta:
default_permissions = ()
def get_data(self): def get_data(self):
""" """
Returns note and star to be serialized in content object serializers. Returns note and star to be serialized in content object serializers.

10
yarn.lock
View File

@ -3358,14 +3358,14 @@ sax@~1.2.1:
version "1.2.2" version "1.2.2"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
"semver@2 || 3 || 4 || 5", semver@^4.1.0, semver@~4.3.3: "semver@2 || 3 || 4 || 5", semver@^5.3.0:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
semver@^5.3.0:
version "5.3.0" version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
semver@^4.1.0, semver@~4.3.3:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
sequencify@~0.0.7: sequencify@~0.0.7:
version "0.0.7" version "0.0.7"
resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"