rename uploaders/downloaders to uploads/downloads

misago/templates/misago/admin/attachmenttypes/form.html

@@ -52,8 +52,8 @@ class="form-horizontal"
     <legend>{% trans "Availability" %}</legend>
 
     {% form_row form.status label_class field_class %}
-    {% form_row form.limit_uploaders_to label_class field_class %}
-    {% form_row form.limit_downloaders_to label_class field_class %}
+    {% form_row form.limit_uploads_to label_class field_class %}
+    {% form_row form.limit_downloads_to label_class field_class %}
 
   </fieldset>
   {% endwith %}

misago/threads/api/attachments.py

@@ -63,7 +63,7 @@ def validate_filetype(upload, user_roles):
     filename = upload.name.strip().lower()
 
     queryset = AttachmentType.objects.filter(status=AttachmentType.ENABLED)
-    for filetype in queryset.prefetch_related('limit_uploaders_to'):
+    for filetype in queryset.prefetch_related('limit_uploads_to'):
         for extension in filetype.extensions_list:
             if filename.endswith('.%s' % extension):
                 break
@@ -73,8 +73,8 @@ def validate_filetype(upload, user_roles):
         if filetype.mimetypes_list and upload.content_type not in filetype.mimetypes_list:
             continue
 
-        if filetype.limit_uploaders_to.exists():
-            allowed_roles = set(r.pk for r in filetype.limit_uploaders_to.all())
+        if filetype.limit_uploads_to.exists():
+            allowed_roles = set(r.pk for r in filetype.limit_uploads_to.all())
             if not user_roles & allowed_roles:
                 continue
 

misago/threads/forms.py

@@ -14,8 +14,8 @@ class AttachmentTypeForm(forms.ModelForm):
             'mimetypes': _("Mimetypes"),
             'size_limit': _("Maximum allowed uploaded file size"),
             'status': _("Status"),
-            'limit_uploaders_to': _("Limit uploads to"),
-            'limit_downloaders_to': _("Limit downloaders to"),
+            'limit_uploads_to': _("Limit uploads to"),
+            'limit_downloads_to': _("Limit downloads to"),
         }
         help_texts = {
             'extensions': _("List of comma separated file extensions associated with this attachment type."),
@@ -23,18 +23,18 @@ class AttachmentTypeForm(forms.ModelForm):
             'size_limit': _("Maximum allowed uploaded file size for this type, in kb. "
                             "May be overriden via user permission."),
             'status': _("Controls this attachment type availability on your site."),
-            'limit_uploaders_to': _("If you wish to limit option to upload files of this type to users with specific "
+            'limit_uploads_to': _("If you wish to limit option to upload files of this type to users with specific "
                                     "roles, select them on this list. Otherwhise don't select any roles to allow all "
                                     "users with permission to upload attachments to be able to upload attachments of "
                                     "this type."),
-            'limit_downloaders_to': _("If you wish to limit option to download files of this type to users with "
+            'limit_downloads_to': _("If you wish to limit option to download files of this type to users with "
                                       "specific roles, select them on this list. Otherwhise don't select any roles to "
                                       "allow all users with permission to download attachments to be able to download "
                                       " attachments of this type."),
         }
         widgets = {
-            'limit_uploaders_to': forms.CheckboxSelectMultiple,
-            'limit_downloaders_to': forms.CheckboxSelectMultiple,
+            'limit_uploads_to': forms.CheckboxSelectMultiple,
+            'limit_downloads_to': forms.CheckboxSelectMultiple,
         }
 
     def clean_extensions(self):

misago/threads/migrations/0001_initial.py

@@ -246,8 +246,8 @@ class Migration(migrations.Migration):
                 ('mimetypes', models.CharField(blank=True, max_length=255, null=True)),
                 ('size_limit', models.PositiveIntegerField(default=1024)),
                 ('status', models.PositiveIntegerField(choices=[(0, 'Allow uploads and downloads'), (1, 'Allow downloads only'), (2, 'Disallow both uploading and downloading')], default=0)),
-                ('limit_downloaders_to', models.ManyToManyField(blank=True, related_name='_attachmenttype_limit_downloaders_to_+', to='misago_acl.Role')),
-                ('limit_uploaders_to', models.ManyToManyField(blank=True, related_name='_attachmenttype_limit_uploaders_to_+', to='misago_acl.Role')),
+                ('limit_downloads_to', models.ManyToManyField(blank=True, related_name='_attachmenttype_limit_downloads_to_+', to='misago_acl.Role')),
+                ('limit_uploads_to', models.ManyToManyField(blank=True, related_name='_attachmenttype_limit_uploads_to_+', to='misago_acl.Role')),
             ],
         ),
         migrations.AddField(

misago/threads/models/attachmenttype.py

@@ -24,8 +24,8 @@ class AttachmentType(models.Model):
         )
     )
 
-    limit_uploaders_to = models.ManyToManyField('misago_acl.Role', related_name='+', blank=True)
-    limit_downloaders_to = models.ManyToManyField('misago_acl.Role', related_name='+', blank=True)
+    limit_uploads_to = models.ManyToManyField('misago_acl.Role', related_name='+', blank=True)
+    limit_downloads_to = models.ManyToManyField('misago_acl.Role', related_name='+', blank=True)
 
     def __str__(self):
         return self.name

misago/threads/tests/test_attachments_api.py

@@ -90,7 +90,7 @@ class AttachmentsApiTestCase(AuthenticatedUserTestCase):
         )
 
         user_roles = (r.pk for r in self.user.get_roles())
-        attachment_type.limit_uploaders_to.set(Role.objects.exclude(id__in=user_roles))
+        attachment_type.limit_uploads_to.set(Role.objects.exclude(id__in=user_roles))
 
         with open(TEST_DOCUMENT_PATH, 'rb') as upload:
             response = self.client.post(self.api_link, data={

misago/threads/tests/test_attachmenttypeadmin_views.py

@@ -67,14 +67,21 @@ class AttachmentTypeAdminViewsTests(AdminTestCase):
         self.assertEqual(test_type.name, 'Test type')
 
         form_link = reverse('misago:admin:system:attachment-types:edit', kwargs={'pk': test_type.pk})
+
+        response = self.client.get(form_link)
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(form_link, data={})
+        self.assertEqual(response.status_code, 200)
+
         response = self.client.post(form_link, data={
             'name': 'Test type edited',
             'extensions': '.test.extension',
             'mimetypes': 'test/edited-mime',
             'size_limit': 512,
             'status': AttachmentType.DISABLED,
-            'limit_uploaders_to': [r.pk for r in Role.objects.all()],
-            'limit_downloaders_to': [r.pk for r in Role.objects.all()],
+            'limit_uploads_to': [r.pk for r in Role.objects.all()],
+            'limit_downloads_to': [r.pk for r in Role.objects.all()],
         })
         self.assertEqual(response.status_code, 302)
 
@@ -90,8 +97,8 @@ class AttachmentTypeAdminViewsTests(AdminTestCase):
         self.assertContains(response, test_type.extensions)
         self.assertContains(response, test_type.mimetypes)
 
-        self.assertEqual(test_type.limit_uploaders_to.count(), Role.objects.count())
-        self.assertEqual(test_type.limit_downloaders_to.count(), Role.objects.count())
+        self.assertEqual(test_type.limit_uploads_to.count(), Role.objects.count())
+        self.assertEqual(test_type.limit_downloads_to.count(), Role.objects.count())
 
         # remove limits from type
         response = self.client.post(form_link, data={
@@ -100,13 +107,13 @@ class AttachmentTypeAdminViewsTests(AdminTestCase):
             'mimetypes': 'test/edited-mime',
             'size_limit': 512,
             'status': AttachmentType.DISABLED,
-            'limit_uploaders_to': [],
-            'limit_downloaders_to': [],
+            'limit_uploads_to': [],
+            'limit_downloads_to': [],
         })
         self.assertEqual(response.status_code, 302)
 
-        self.assertEqual(test_type.limit_uploaders_to.count(), 0)
-        self.assertEqual(test_type.limit_downloaders_to.count(), 0)
+        self.assertEqual(test_type.limit_uploads_to.count(), 0)
+        self.assertEqual(test_type.limit_downloads_to.count(), 0)
 
     def test_clean_params_view(self):
         """admin form nicely cleans lists of extensions/mimetypes"""

misago/threads/tests/test_attachmentview.py

@@ -144,7 +144,7 @@ class AttachmentViewTestCase(AuthenticatedUserTestCase):
         attachment = self.upload_document()
 
         user_roles = (r.pk for r in self.user.get_roles())
-        self.attachment_type_pdf.limit_downloaders_to.set(Role.objects.exclude(id__in=user_roles))
+        self.attachment_type_pdf.limit_downloads_to.set(Role.objects.exclude(id__in=user_roles))
 
         response = self.client.get(attachment.get_absolute_url())
         self.assertIs403(response)
@@ -205,7 +205,7 @@ class AttachmentViewTestCase(AuthenticatedUserTestCase):
         attachment = self.upload_document()
 
         user_roles = self.user.get_roles()
-        self.attachment_type_pdf.limit_downloaders_to.set(user_roles)
+        self.attachment_type_pdf.limit_downloads_to.set(user_roles)
 
         response = self.client.get(attachment.get_absolute_url())
         self.assertSuccess(response)

misago/threads/views/attachment.py

@@ -52,7 +52,7 @@ def allow_file_download(request, attachment):
         if not is_authenticated or request.user.id != attachment.uploader_id:
             raise PermissionDenied()
 
-    allowed_roles = set(r.pk for r in attachment.filetype.limit_downloaders_to.all())
+    allowed_roles = set(r.pk for r in attachment.filetype.limit_downloads_to.all())
     if allowed_roles:
         user_roles = set(r.pk for r in request.user.get_roles())
         if not user_roles & allowed_roles: