Make admin views respect apps__*__include (iommirocks#695)

Author: jlubcke

iommi/admin.py

@@ -151,6 +151,10 @@ class Meta:
 
     @read_config
     @with_defaults(
+        include=lambda admin, **_: (
+                admin.app_name is None
+                or admin.apps.get(admin.app_name+'_'+admin.model_name, Namespace(include=False)).include is True
+        ),
         apps__auth_user__include=True,
         parts__edit_auth_user__fields__password__write_to_instance=lambda instance, value, **_: instance.set_password(value),
         parts__edit_auth_user__fields__password__read_from_instance=lambda **_: '',

iommi/admin__tests.py

@@ -37,6 +37,7 @@ def test_bulk_edit_for_non_unique(settings):
     request = staff_req('get')
     result = (
         Admin.list(
+            apps__tests_adminunique__include=True,
             parts__list_tests_adminunique__columns__foo__bulk__include=True,
         )
         .refine_with_params(
@@ -48,22 +49,25 @@ def test_bulk_edit_for_non_unique(settings):
 
     assert [x._name for x in values(result.parts.list_tests_adminunique.columns) if x.bulk.include] == ['foo']
 
+class FooAdmin(Admin):
+    class Meta:
+        apps__tests_foo__include = True
 
 @pytest.mark.django_db
 @mock.patch('iommi.admin.messages')
 def test_create(mock_messages, settings):
     settings.ROOT_URLCONF = __name__
 
     request = staff_req('get')
-    c = Admin.create().refine_with_params(app_name='tests', model_name='foo')
+    c = FooAdmin.create().refine_with_params(app_name='tests', model_name='foo')
     p = c.bind(request=request)
     assert list(p.parts.create_tests_foo.fields.keys()) == ['foo']
 
     assert Foo.objects.count() == 0
 
     # Check access control for not logged in
     request = req('post', foo=7, **{'-submit': ''})
-    view = Admin.create().as_view()
+    view = FooAdmin.create().as_view()
     assert isinstance(view(request, app_name='tests', model_name='foo'), HttpResponseRedirect)
     assert Foo.objects.count() == 0
 
@@ -74,7 +78,7 @@ def test_create(mock_messages, settings):
 
     # Now for real
     request = staff_req('post', foo=7, **{'-submit': ''})
-    c = Admin.create().refine_with_params(app_name='tests', model_name='foo')
+    c = FooAdmin.create().refine_with_params(app_name='tests', model_name='foo')
     p = c.bind(request=request)
     assert p.parts.create_tests_foo.is_valid()
     p.render_to_response()
@@ -95,7 +99,7 @@ def test_edit(mock_messages, settings):
     assert Foo.objects.count() == 0
     f = Foo.objects.create(foo=7)
 
-    c = Admin.edit().refine_with_params(app_name='tests', model_name='foo', pk=f.pk)
+    c = FooAdmin.edit().refine_with_params(app_name='tests', model_name='foo', pk=f.pk)
     request = staff_req('post', foo=11, **{'-submit': ''})
     p = c.bind(request=request)
     assert p.parts.edit_tests_foo.is_valid()
@@ -114,7 +118,7 @@ def test_delete(mock_messages, settings):
     assert Foo.objects.count() == 0
     f = Foo.objects.create(foo=7)
 
-    c = Admin.delete().refine_with_params(app_name='tests', model_name='foo', pk=f.pk)
+    c = FooAdmin.delete().refine_with_params(app_name='tests', model_name='foo', pk=f.pk)
     request = staff_req('post', **{'-submit': ''})
     p = c.bind(request=request)
     assert p.parts.delete_tests_foo.is_valid(), p.parts.delete_tests_foo.get_errors()
@@ -131,10 +135,10 @@ def test_delete(mock_messages, settings):
 @pytest.mark.parametrize(
     'admin, kwargs',
     [
-        (Admin.all_models(), dict()),
-        (Admin.list(), dict(app_name='tests', model_name='foo')),
-        (Admin.edit(), dict(app_name='tests', model_name='foo', pk=0)),
-        (Admin.delete(), dict(app_name='tests', model_name='foo', pk=0)),
+        (FooAdmin.all_models(), dict()),
+        (FooAdmin.list(), dict(app_name='tests', model_name='foo')),
+        (FooAdmin.edit(), dict(app_name='tests', model_name='foo', pk=0)),
+        (FooAdmin.delete(), dict(app_name='tests', model_name='foo', pk=0)),
     ],
 )
 def test_redirect_to_login(settings, is_authenticated, admin, kwargs):
@@ -174,6 +178,38 @@ def test_404_for_non_staff(settings, admin, kwargs):
         view(request=request, **kwargs)
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize(
+    'success, admin, kwargs',
+    [
+        (False, Admin.list(), dict(app_name='tests', model_name='foo')),
+        (False, Admin.edit(), dict(app_name='tests', model_name='foo', pk=0)),
+        (False, Admin.delete(), dict(app_name='tests', model_name='foo', pk=0)),
+        (False, Admin.list(apps__tests_foo__include=False), dict(app_name='tests', model_name='foo')),
+        (False, Admin.edit(apps__tests_foo__include=False), dict(app_name='tests', model_name='foo', pk=0)),
+        (False, Admin.delete(apps__tests_foo__include=False), dict(app_name='tests', model_name='foo', pk=0)),
+        (True, Admin.list(apps__tests_foo__include=True), dict(app_name='tests', model_name='foo')),
+        (True, Admin.edit(apps__tests_foo__include=True), dict(app_name='tests', model_name='foo', pk=0)),
+        (True, Admin.delete(apps__tests_foo__include=True), dict(app_name='tests', model_name='foo', pk=0)),
+    ],
+)
+def test_404_for_non_include(settings, success, admin, kwargs):
+    settings.ROOT_URLCONF = __name__
+    if 'pk' in kwargs:
+        Foo.objects.create(pk=kwargs['pk'], foo=1)
+    view = admin.as_view()
+    request = user_req('get')
+    request.user = Struct(is_staff=True, is_authenticated=True, is_superuser=True)
+
+    if success:
+        result = view(request=request, **kwargs)
+        assert result.status_code == 200
+    else:
+        with pytest.raises(Http404):
+            view(request=request, **kwargs)
+
+
+
 def test_messages():
     request = req('get')
     message = 'test message'
@@ -270,7 +306,7 @@ def test_no_config():
 @mock.patch('iommi.admin.messages')
 def test_create_non_int_pk(mock_messages, settings):
     request = staff_req('post', id=str(uuid4()), foo='banana', **{'-submit': ''})
-    c = Admin.create().refine_with_params(app_name='tests', model_name='uuidpkmodel')
+    c = FooAdmin.create(apps__tests_uuidpkmodel__include=True).refine_with_params(app_name='tests', model_name='uuidpkmodel')
     p = c.bind(request=request)
     assert p.parts.create_tests_uuidpkmodel.is_valid()
     p.render_to_response()
@@ -290,7 +326,7 @@ def test_edit_non_int_pk(mock_messages, settings):
     settings.ROOT_URLCONF = __name__
     f = UuidPKModel.objects.create(id=str(uuid4()), foo='banana')
 
-    c = Admin.edit().refine_with_params(app_name='tests', model_name='uuidpkmodel', pk=f.pk)
+    c = Admin.edit(apps__tests_uuidpkmodel__include=True).refine_with_params(app_name='tests', model_name='uuidpkmodel', pk=f.pk)
     request = staff_req('post', id=f.pk, foo='orange', **{'-submit': ''})
     p = c.bind(request=request)
     assert p.parts.edit_tests_uuidpkmodel.is_valid(), p.parts.edit_tests_uuidpkmodel.get_errors()

iommi/base.py

@@ -47,7 +47,11 @@ def view_wrapper(request, **view_params):
             view_wrapper.__iommi_target__ = view_wrapper.__iommi_target__.refine_done()
 
         decode_path_components(request, **view_params)
-        return view_wrapper.__iommi_target__.bind(request=request).render_to_response()
+        part = view_wrapper.__iommi_target__.bind(request=request)
+        if part is None:
+            from django.http import Http404
+            raise Http404()
+        return part.render_to_response()
 
     view_wrapper.__name__ = f'{target.__class__.__name__}.as_view'
     view_wrapper.__doc__ = target.__class__.__doc__