diff --git a/openslides/motions/views.py b/openslides/motions/views.py
index 34bcac0ec..87b777d72 100644
--- a/openslides/motions/views.py
+++ b/openslides/motions/views.py
@@ -63,7 +63,7 @@ class MotionViewSet(ModelViewSet):
"""
if self.action in ('list', 'retrieve'):
result = self.get_access_permissions().check_permissions(self.request.user)
- elif self.action in ('metadata', 'partial_update', 'update'):
+ elif self.action in ('metadata', 'partial_update', 'update', 'set_personal_note'):
result = has_perm(self.request.user, 'motions.can_see')
# For partial_update and update requests the rest of the check is
# done in the update method. See below.
@@ -355,6 +355,20 @@ class MotionViewSet(ModelViewSet):
person=request.user)
return Response({'detail': message})
+ @detail_route(methods=['put'])
+ def set_personal_note(self, request, pk=None):
+ """
+ Special view endpoint to save a personal note to a motion.
+
+ Send PUT with {'note':
, 'star': True|False}.
+ """
+ motion = self.get_object()
+ if not request.user.is_authenticated():
+ raise ValidationError({'detail': _('Anonymous users are not able to set personal notes.')})
+ motion.set_personal_note(request.user, request.data.get('note'), bool(request.data.get('star')))
+ message = _('You set yopur personal notes successfully.')
+ return Response({'detail': message})
+
@detail_route(methods=['post'])
def create_poll(self, request, pk=None):
"""
diff --git a/openslides/users/migrations/0004_personalnote.py b/openslides/users/migrations/0004_personalnote.py
new file mode 100644
index 000000000..be3c9ce51
--- /dev/null
+++ b/openslides/users/migrations/0004_personalnote.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-04-07 14:15
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('contenttypes', '0002_remove_content_type_name'),
+ ('users', '0003_group'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='PersonalNote',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('object_id', models.PositiveIntegerField()),
+ ('note', models.TextField(blank=True)),
+ ('star', models.BooleanField(default=False)),
+ ('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)),
+ ],
+ ),
+ ]
diff --git a/openslides/users/models.py b/openslides/users/models.py
index 3ec29eed2..47b363dc3 100644
--- a/openslides/users/models.py
+++ b/openslides/users/models.py
@@ -9,6 +9,8 @@ from django.contrib.auth.models import (
Permission,
PermissionsMixin,
)
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.db.models import Prefetch, Q
@@ -17,6 +19,36 @@ from ..utils.models import RESTModelMixin
from .access_permissions import GroupAccessPermissions, UserAccessPermissions
+class PersonalNote(models.Model):
+ """
+ Model for personal notes and likes (stars) of a user concerning different
+ openslides models like motions.
+
+ To use this in your app simply run e. g.
+
+ user.set_personal_note(motion, note, star)
+
+ in a setter view and add a SerializerMethodField to your serializer that
+ calls get_data for all users.
+ """
+ user = models.ForeignKey('User', on_delete=models.CASCADE, related_name='personal_notes')
+ content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+ object_id = models.PositiveIntegerField()
+ content_object = GenericForeignKey()
+ note = models.TextField(blank=True)
+ star = models.BooleanField(default=False, blank=True)
+
+ def get_data(self):
+ """
+ Returns note and star to be serialized in content object serializers.
+ """
+ return {
+ 'user_id': self.user_id,
+ 'note': self.note,
+ 'star': self.star,
+ }
+
+
class UserManager(BaseUserManager):
"""
Customized manager that creates new users only with a password and a
@@ -211,6 +243,29 @@ class User(RESTModelMixin, PermissionsMixin, AbstractBaseUser):
"""
raise RuntimeError('Do not use user.has_perm() but use openslides.utils.auth.has_perm')
+ def set_personal_note(self, content_object, note=None, star=None):
+ """
+ Saves or overrides a personal note for this user for a given object
+ like motion.
+ """
+ changes = {}
+ if note is not None:
+ changes['note'] = note
+ if star is not None:
+ changes['star'] = star
+ if changes:
+ # TODO: This is prone to race-conditions in rare cases. Fix it.
+ personal_note, created = PersonalNote.objects.update_or_create(
+ user=self,
+ content_type=ContentType.objects.get_for_model(content_object),
+ object_id=content_object.id,
+ user_id=self.id,
+ defaults=changes,
+ )
+ else:
+ personal_note = None
+ return personal_note
+
class GroupManager(GroupManager):
"""
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index fe4289a4f..de84e2bbc 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -538,7 +538,6 @@ angular.module('OpenSlidesApp.users.site', [
choiceYes: gettext('Is a committee'),
choiceNo: gettext('Is not a committee'),
},
-
};
}
$scope.filter.propertyList = ['first_name', 'last_name', 'title', 'number', 'comment', 'structure_level'];
diff --git a/tests/integration/motions/test_viewset.py b/tests/integration/motions/test_viewset.py
index 0807cfbd5..6c75123ac 100644
--- a/tests/integration/motions/test_viewset.py
+++ b/tests/integration/motions/test_viewset.py
@@ -25,6 +25,9 @@ class TestMotionDBQueries(TestCase):
config['general_system_enable_anonymous'] = True
for index in range(10):
Motion.objects.create(title='motion{}'.format(index))
+ get_user_model().objects.create_user(
+ username='user_{}'.format(index),
+ password='password')
# TODO: Create some polls etc.
@use_cache()
@@ -39,10 +42,11 @@ class TestMotionDBQueries(TestCase):
* 1 request to get the polls,
* 1 request to get the attachments,
* 1 request to get the tags,
- * 2 requests to get the submitters and supporters and
+ * 2 requests to get the submitters and supporters,
+ * 1 requests to get the personal notes.
"""
self.client.force_login(get_user_model().objects.get(pk=1))
- with self.assertNumQueries(14):
+ with self.assertNumQueries(15):
self.client.get(reverse('motion-list'))
@use_cache()
@@ -57,9 +61,10 @@ class TestMotionDBQueries(TestCase):
* 1 request to get the polls,
* 1 request to get the attachments,
* 1 request to get the tags,
- * 2 requests to get the submitters and supporters
+ * 2 requests to get the submitters and supporters,
+ * 1 request to get the personal notes.
"""
- with self.assertNumQueries(13):
+ with self.assertNumQueries(14):
self.client.get(reverse('motion-list'))
@@ -378,10 +383,29 @@ class RetrieveMotion(TestCase):
text='test_text_ithohchaeThohmae5aug')
self.motion.save()
self.motion.create_poll()
+ for index in range(10):
+ get_user_model().objects.create_user(
+ username='user_{}'.format(index),
+ password='password')
@use_cache()
def test_number_of_queries(self):
- with self.assertNumQueries(18):
+ """
+ Tests that only the following db queries are done:
+ * 7 requests to get the session and the request user with its permissions (3 of them are possibly a bug)
+ * 1 request to get the motion,
+ * 1 request to get the version,
+ * 1 request to get the agenda item,
+ * 1 request to get the log,
+ * 3 request to get the polls (1 of them is possibly a bug),
+ * 1 request to get the attachments,
+ * 1 request to get the tags,
+ * 2 requests to get the submitters and supporters,
+ * 1 request to get personal notes.
+
+ TODO: Fix all bugs.
+ """
+ with self.assertNumQueries(19):
self.client.get(reverse('motion-detail', args=[self.motion.pk]))
def test_guest_state_with_required_permission_to_see(self):
@@ -434,6 +458,14 @@ class RetrieveMotion(TestCase):
response_3 = guest_client.get(reverse('user-detail', args=[extra_user.pk]))
self.assertEqual(response_3.status_code, status.HTTP_403_FORBIDDEN)
+ def test_anonymous_without_personal_notes(self):
+ self.motion.set_personal_note(get_user_model().objects.get(pk=1), note='admin_personal_note_OoGh8choro0oosh0roob')
+ config['general_system_enable_anonymous'] = True
+ guest_client = APIClient()
+ response = guest_client.get(reverse('motion-detail', args=[self.motion.pk]))
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+ self.assertNotContains(response, 'admin_personal_note_OoGh8choro0oosh0roob')
+
class UpdateMotion(TestCase):
"""