Merge branch 'dev' into release/2

coderedcms/blocks/base_blocks.py

@@ -52,7 +52,10 @@ class ClassifierTermChooserBlock(blocks.FieldBlock):
         Convert the serialized value back into a python object.
         """
         if isinstance(value, int):
-            return self.target_model.objects.get(pk=value)
+            try:
+                return self.target_model.objects.get(pk=value)
+            except self.target_model.DoesNotExist:
+                return None
         return value
 
     def get_prep_value(self, value):

coderedcms/templates/coderedcms/widgets/checkbox_classifiers.html

@@ -5,7 +5,7 @@
   {% if group %}
   <div class="field-col col4">
     <ul class="crx-checkbox-group">
-      <li><label>{{ group }}</label>
+      <li><label class="w-field__label">{{ group }}</label>
         {% endif %}
         <ul {% if id %}id="{{ id }}_{{ index }}"{% endif %}>
           {% for option in options %}
@@ -18,9 +18,10 @@
   </div>
   {% endif %}
   {% if forloop.counter|divisibleby:3 %}
-  <div class="clearfix"></div>
+  <div style="clear:both;"></div>
   {% endif %}
   {% endfor %}
+  <div style="clear:both;"></div>
 </div>
 {% endwith %}
 {% else %}

docs/releases/index.rst

@@ -25,6 +25,7 @@ Supported Versions:
 .. toctree::
     :maxdepth: 1
 
+    v2.1.2
     v2.1.1
     v2.1.0
     v2.0.0

docs/releases/v2.1.2.rst

@@ -0,0 +1,8 @@
+v2.1.2 release notes
+====================
+
+Bug fixes:
+
+* Instead of throwing a server error, return None if "Latest Pages" block has invalid (i.e. deleted) classifier term.
+
+* Fix display issue with classifier terms in Wagtail Admin when editing a page.