Merge branch 'missing-site-import'

Merges #265

Author: acatton

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.3.2 (unreleased)
+-----------------
+
+Bugfix - Allow WidgyAdmin to check for ReviewedWidgySite without review_queue
+installed [Scott Clark, #265]
+
 0.3.1 (2014-10-01)
 ------------------
 

widgy/contrib/widgy_mezzanine/admin.py

@@ -31,6 +31,13 @@
 WidgyPage = get_widgypage_model()
 
 
+if 'widgy.contrib.review_queue' in settings.INSTALLED_APPS:
+    REVIEW_QUEUE_INSTALLED = True
+    from widgy.contrib.review_queue.site import ReviewedWidgySite
+else:
+    REVIEW_QUEUE_INSTALLED = False
+
+
 class PageVersionedWidgyWidget(VersionedWidgyWidget):
     template_name = 'widgy/widgy_mezzanine/versioned_widgy_field.html'
 
@@ -172,7 +179,7 @@ def render_change_form(self, request, context, add=False, change=False, form_url
 
     @property
     def has_review_queue(self):
-        return isinstance(self.get_site(), ReviewedWidgySite)
+        return REVIEW_QUEUE_INSTALLED and isinstance(self.get_site(), ReviewedWidgySite)
 
     def get_site(self):
         return get_site(settings.WIDGY_MEZZANINE_SITE)
@@ -292,10 +299,10 @@ def publish_page_on_approve(sender, instance, created, **kwargs):
                 status=CONTENT_STATUS_DRAFT,
             )
 
-if 'widgy.contrib.review_queue' in settings.INSTALLED_APPS:
+
+if REVIEW_QUEUE_INSTALLED:
     from widgy.contrib.review_queue.admin import VersionCommitAdminBase
     from widgy.contrib.review_queue.models import ReviewedVersionCommit
-    from widgy.contrib.review_queue.site import ReviewedWidgySite
 
     class VersionCommitAdmin(VersionCommitAdminBase):
         def get_site(self):