Merge pull request #108 from postatum/103056296_polymorphic_400

Change instance check in events

nefertari/events.py

@@ -242,7 +242,7 @@ def trigger_events(view_obj):
                 view_obj._json_params,
                 view_obj.Model)
         }
-        if isinstance(view_obj.context, view_obj.Model):
+        if hasattr(view_obj.context, 'pk_field'):
             event_kwargs['instance'] = view_obj.context
 
         before_event = BEFORE_EVENTS[request.action]

tests/test_events.py

@@ -40,15 +40,11 @@ def test_set_field_value_no_field_name_no_field(self):
 
     @patch('nefertari.utils.FieldData.from_dict')
     def test_trigger_events(self, mock_from):
-        class A(object):
-            pass
-
         mock_after = Mock()
         mock_before = Mock()
         mock_from.return_value = {'foo': 1}
-        ctx = A()
+        ctx = Mock()
         view = Mock(
-            Model=A,
             request=Mock(action='index'),
             _json_params={'bar': 1},
             context=ctx,
@@ -61,14 +57,16 @@ class A(object):
                     pass
 
         mock_after.assert_called_once_with(
-            fields={'foo': 1}, model=A, instance=ctx, view=view)
+            fields={'foo': 1}, model=view.Model, instance=ctx,
+            view=view)
         mock_before.assert_called_once_with(
-            fields={'foo': 1}, model=A, instance=ctx, view=view)
+            fields={'foo': 1}, model=view.Model, instance=ctx,
+            view=view)
         view.request.registry.notify.assert_has_calls([
             call(mock_before()),
             call(mock_after()),
         ])
-        mock_from.assert_called_once_with({'bar': 1}, A)
+        mock_from.assert_called_once_with({'bar': 1}, view.Model)
 
     @patch('nefertari.utils.FieldData.from_dict')
     def test_trigger_events_silent_view(self, mock_from):