Refine collection visibility and team selection

core/tests.py

@@ -164,6 +164,16 @@ class CollectionTests(TestCase):
         self.assertRedirects(response, manage_url)
         self.assertTrue(CollectionSection.objects.filter(collection=collection, item=note).exists())
 
+    def test_public_note_can_be_added_to_private_collection_without_conversion(self):
+        collection = Collection.objects.create(owner=self.user, title='Private guide', visibility=Item.Visibility.PRIVATE)
+        note = Item.objects.create(owner=self.user, kind=Item.Kind.NOTE, content='Already public', visibility=Item.Visibility.PUBLIC)
+        manage_url = reverse('collection_manage', args=[collection.id])
+        response = self.client.post(manage_url, {'action': 'add', 'item_id': note.id})
+        self.assertRedirects(response, manage_url)
+        self.assertTrue(collection.sections.filter(item=note).exists())
+        note.refresh_from_db()
+        self.assertEqual(note.visibility, Item.Visibility.PUBLIC)
+
     def test_public_collection_asks_before_copying_private_note(self):
         collection = Collection.objects.create(owner=self.user, title='Public guide', visibility=Item.Visibility.PUBLIC)
         note = Item.objects.create(owner=self.user, kind=Item.Kind.NOTE, content='Private section')
@@ -201,6 +211,21 @@ class CollectionTests(TestCase):
         self.assertEqual(collection.team, team)
         self.assertEqual(collection.visibility, Item.Visibility.TEAM)
 
+    def test_other_users_public_notes_are_not_offered_for_embedding(self):
+        other = get_user_model().objects.create_user(username='other')
+        public_note = Item.objects.create(owner=other, kind=Item.Kind.NOTE, content='External', visibility=Item.Visibility.PUBLIC)
+        collection = Collection.objects.create(owner=self.user, title='Own collection')
+        response = self.client.get(reverse('collection_manage', args=[collection.id]))
+        self.assertNotContains(response, f'name="item_id" value="{public_note.id}"')
+
+    def test_collection_form_only_offers_team_tags(self):
+        team = Team.objects.create(name='Docs team', slug='docs', owner=self.user)
+        TeamMembership.objects.create(team=team, user=self.user, role=TeamMembership.Role.OWNER)
+        Tag.objects.create(name='docs')
+        Tag.objects.create(name='ordinary')
+        response = self.client.get(reverse('collection_create'))
+        self.assertEqual(list(response.context['form'].fields['tags'].queryset.values_list('name', flat=True)), ['docs'])
+
     def test_collection_opens_as_continuous_reading_view(self):
         collection = Collection.objects.create(owner=self.user, title='Reading view')
         first = Item.objects.create(owner=self.user, kind=Item.Kind.NOTE, content='First paragraph')