Fixed build

misago/acl/tests/test_forumroleadmin_views.py

@@ -3,6 +3,14 @@ from misago.admin.testutils import AdminTestCase
 from misago.acl.models import ForumRole
 
 
+def fake_data(data_dict):
+    data_dict.update({
+        'can_see_forum': 0,
+        'can_browse_forum': 0,
+    })
+    return data_dict
+
+
 class ForumRoleAdminViewsTests(AdminTestCase):
     def test_link_registered(self):
         """admin nav contains forum roles link"""
@@ -27,9 +35,7 @@ class ForumRoleAdminViewsTests(AdminTestCase):
 
         response = self.client.post(
             reverse('misago:admin:permissions:forums:new'),
-            data={
-                'name': 'Test ForumRole',
-            })
+            data=fake_data({'name': 'Test ForumRole'}))
         self.assertEqual(response.status_code, 302)
 
         test_role = ForumRole.objects.get(name='Test ForumRole')
@@ -42,9 +48,7 @@ class ForumRoleAdminViewsTests(AdminTestCase):
         """edit role view has no showstoppers"""
         self.client.post(
             reverse('misago:admin:permissions:forums:new'),
-            data={
-                'name': 'Test ForumRole',
-            })
+            data=fake_data({'name': 'Test ForumRole'}))
 
         test_role = ForumRole.objects.get(name='Test ForumRole')
 
@@ -57,7 +61,7 @@ class ForumRoleAdminViewsTests(AdminTestCase):
         response = self.client.post(
             reverse('misago:admin:permissions:forums:edit',
                     kwargs={'role_id': test_role.pk}),
-            data={'name': 'Top Lel'})
+            data=fake_data({'name': 'Top Lel'}))
         self.assertEqual(response.status_code, 302)
 
         test_role = ForumRole.objects.get(name='Top Lel')
@@ -70,9 +74,7 @@ class ForumRoleAdminViewsTests(AdminTestCase):
         """delete role view has no showstoppers"""
         self.client.post(
             reverse('misago:admin:permissions:forums:new'),
-            data={
-                'name': 'Test ForumRole',
-            })
+            data=fake_data({'name': 'Test ForumRole'}))
 
         test_role = ForumRole.objects.get(name='Test ForumRole')
         response = self.client.post(

misago/acl/tests/test_roleadmin_views.py

@@ -3,6 +3,23 @@ from misago.admin.testutils import AdminTestCase
 from misago.acl.models import Role
 
 
+def fake_data(data_dict):
+    data_dict.update({
+        'name_changes_allowed': 0,
+        'changes_expire': 0,
+        'can_use_signature': 0,
+        'allow_signature_links': 0,
+        'allow_signature_images': 0,
+        'can_destroy_user_newer_than': 0,
+        'can_destroy_users_with_less_posts_than': 0,
+        'can_search_users': 0,
+        'can_see_users_emails': 0,
+        'can_see_users_ips': 0,
+        'can_see_hidden_users': 0,
+    })
+    return data_dict
+
+
 class RoleAdminViewsTests(AdminTestCase):
     def test_link_registered(self):
         """admin nav contains user roles link"""
@@ -27,9 +44,7 @@ class RoleAdminViewsTests(AdminTestCase):
 
         response = self.client.post(
             reverse('misago:admin:permissions:users:new'),
-            data={
-                'name': 'Test Role',
-            })
+            data=fake_data({'name': 'Test Role'}))
         self.assertEqual(response.status_code, 302)
 
         test_role = Role.objects.get(name='Test Role')
@@ -42,9 +57,7 @@ class RoleAdminViewsTests(AdminTestCase):
         """edit role view has no showstoppers"""
         self.client.post(
             reverse('misago:admin:permissions:users:new'),
-            data={
-                'name': 'Test Role',
-            })
+            data=fake_data({'name': 'Test Role'}))
 
         test_role = Role.objects.get(name='Test Role')
 
@@ -57,7 +70,7 @@ class RoleAdminViewsTests(AdminTestCase):
         response = self.client.post(
             reverse('misago:admin:permissions:users:edit',
                     kwargs={'role_id': test_role.pk}),
-            data={'name': 'Top Lel'})
+            data=fake_data({'name': 'Top Lel'}))
         self.assertEqual(response.status_code, 302)
 
         test_role = Role.objects.get(name='Top Lel')
@@ -70,9 +83,7 @@ class RoleAdminViewsTests(AdminTestCase):
         """delete role view has no showstoppers"""
         self.client.post(
             reverse('misago:admin:permissions:users:new'),
-            data={
-                'name': 'Test Role',
-            })
+            data=fake_data({'name': 'Test Role'}))
 
         test_role = Role.objects.get(name='Test Role')
         response = self.client.post(

misago/forums/permissions.py

@@ -5,7 +5,7 @@ from misago.core import forms
 
 class PermissionsForm(forms.Form):
     legend = _("Destroying user accounts")
-    cam_see_forum = forms.YesNoSwitch(label=_("Can see forum"))
+    can_see_forum = forms.YesNoSwitch(label=_("Can see forum"))
     can_browse_forum = forms.YesNoSwitch(label=_("Can see forum contents"))
 
 

misago/users/permissions/profiles.py

@@ -9,13 +9,12 @@ class PermissionsForm(forms.Form):
         label=_("Can search user profiles"))
     can_see_users_emails = forms.YesNoSwitch(
         label=_("Can see members e-mail's"))
-    can_see_users_trails = forms.YesNoSwitch(
-        label=_("Can see members ip's and user-agents"))
+    can_see_users_ips = forms.YesNoSwitch(
+        label=_("Can see members IPs"))
     can_see_hidden_users = forms.YesNoSwitch(
         label=_("Can see members that hide their presence"))
 
 
-
 def change_permissions_form(role):
     if role.__class__ == Role:
         return PermissionsForm