Merge branch 'snippet_chooser_panel' of https://github.com/jossingram/wagtail into jossingram-snippet_chooser_panel

Conflicts:
	wagtail/wagtailsnippets/tests.py

wagtail/wagtailsnippets/edit_handlers.py

@@ -4,28 +4,42 @@ from django.template.loader import render_to_string
 from django.contrib.contenttypes.models import ContentType
 from django.utils.safestring import mark_safe
 from django.utils.encoding import force_text
+from django.core.exceptions import ImproperlyConfigured
 
 from wagtail.wagtailadmin.edit_handlers import BaseChooserPanel
+from wagtail.wagtailcore.utils import resolve_model_string
 from .widgets import AdminSnippetChooser
 
 
 class BaseSnippetChooserPanel(BaseChooserPanel):
     object_type_name = 'item'
 
-    _content_type = None
+    _target_content_type = None
 
     @classmethod
     def widget_overrides(cls):
         return {cls.field_name: AdminSnippetChooser(
-            content_type=cls.content_type(), snippet_type_name=cls.snippet_type_name)}
+            content_type=cls.target_content_type(), snippet_type_name=cls.snippet_type_name)}
 
     @classmethod
-    def content_type(cls):
-        if cls._content_type is None:
-            # TODO: infer the content type by introspection on the foreign key rather than having to pass it explicitly
-            cls._content_type = ContentType.objects.get_for_model(cls.snippet_type)
+    def target_content_type(cls):
+        if cls._target_content_type is None:
+            if cls.snippet_type:
+                try:
+                    model = resolve_model_string(cls.snippet_type)
+                except LookupError:
+                    raise ImproperlyConfigured("{0}.snippet_type must be of the form 'app_label.model_name', given {1!r}".format(
+                        cls.__name__, cls.snippet_type))
+                except ValueError:
+                    raise ImproperlyConfigured("{0}.snippet_type refers to model {1!r} that has not been installed".format(
+                        cls.__name__, cls.snippet_type))
 
-        return cls._content_type
+                cls._target_content_type = ContentType.objects.get_for_model(model)
+            else:
+                target_model = cls.model._meta.get_field(cls.field_name).rel.to
+                cls._target_content_type = ContentType.objects.get_for_model(target_model)
+
+        return cls._target_content_type
 
     def render_as_field(self):
         instance_obj = self.get_chosen_item()
@@ -35,6 +49,10 @@ class BaseSnippetChooserPanel(BaseChooserPanel):
             'snippet_type_name': self.snippet_type_name,
         }))
 
+    @property
+    def snippet_type_name(self):
+        return force_text(self.target_content_type()._meta.verbose_name)
+
 
 class SnippetChooserPanel(object):
     def __init__(self, field_name, snippet_type):
@@ -45,6 +63,5 @@ class SnippetChooserPanel(object):
         return type(str('_SnippetChooserPanel'), (BaseSnippetChooserPanel,), {
             'model': model,
             'field_name': self.field_name,
-            'snippet_type_name': force_text(self.snippet_type._meta.verbose_name),
             'snippet_type': self.snippet_type,
         })

wagtail/wagtailsnippets/tests.py

@@ -3,11 +3,13 @@ from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
+from django.core.exceptions import ImproperlyConfigured
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.tests.testapp.models import Advert, SnippetChooserModel
 from wagtail.tests.snippets.models import AlphaSnippet, ZuluSnippet, RegisterDecorator, RegisterFunction, SearchableSnippet
 from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS
+from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
 
 from wagtail.wagtailsnippets.views.snippets import (
     get_snippet_edit_handler
@@ -237,6 +239,31 @@ class TestSnippetChooserPanel(TestCase):
         self.assertIn('createSnippetChooser("id_advert", "tests/advert");',
                       self.snippet_chooser_panel.render_as_field())
 
+    def test_target_content_type(self):
+        result = SnippetChooserPanel(
+            'barbecue',
+            'wagtailcore.site'
+        ).bind_to_model(SnippetChooserModel).target_content_type()
+        self.assertEqual(result.name, 'Site')
+
+    def test_target_content_type_malformed_type(self):
+        result = SnippetChooserPanel(
+            'barbecue',
+            'snowman'
+        ).bind_to_model(SnippetChooserModel)
+        self.assertRaises(ImproperlyConfigured,
+                          result.target_content_type)
+
+    def test_target_content_type_nonexistent_type(self):
+        result = SnippetChooserPanel(
+            'barbecue',
+            'snowman.lorry'
+        ).bind_to_model(SnippetChooserModel)
+        self.assertRaises(ImproperlyConfigured,
+                          result.target_content_type)
+
+
+
 
 class TestSnippetRegistering(TestCase):
     def test_register_function(self):