Minor refactoring of publishing_column, and a couple of tweaks to publishing to make it accommodate more types of FluentLayout model, which arose from the Articles work.

Author: Greg Turner

icekit/dashboard/templates/admin/app_widget.html

@@ -28,7 +28,7 @@ <h3>{% firstof model.verbose_name_plural model.verbose_name|pluralize model.name
 							<select name="type-select" class="type-select">
 								{% for ctype_id, name in model.polymorphic_classes %}
 									<option value="{{ model.add_url }}?ct_id={{ ctype_id }}" data-manage="{{ model.admin_url }}?ct_id={{ ctype_id }}"{% if forloop.first and not app.default_poly_child or app.default_poly_child == ctype_id %} selected{% endif %}>
-										{{ name }}
+										{{ name|capfirst }}
 									</option>
 								{% endfor %}
 							</select>

icekit/publishing/admin.py

@@ -238,21 +238,13 @@ def publishing_column(self, obj):
         if hasattr(obj, 'get_real_instance'):
             obj = obj.get_real_instance()
 
-        try:
-            published_obj_url = obj.get_absolute_url()
-            draft_obj_url = published_obj_url + '?edit'
-        except:
-            published_obj_url = draft_obj_url = None
-
         template_name = 'admin/publishing/_change_list_publishing_column.html'
         t = loader.get_template(template_name)
         c = Context({
             'object': obj,
             'has_publish_permission':
                 self.has_publish_permission(self.request, obj),
             'img_path': settings.STATIC_URL + 'admin/img/',
-            'published_url': published_obj_url,
-            'draft_url': draft_obj_url,
         })
         try:
             if isinstance(obj, PublishingModel):

icekit/publishing/models.py

@@ -446,8 +446,6 @@ def clone(src, dst):
 
     @assert_draft
     def patch_placeholders(self):
-        if not isinstance(self, FluentContentsPage):
-            return
         published_obj = self.publishing_linked
 
         for draft_placeholder, published_placeholder in zip(
@@ -494,8 +492,6 @@ def clone_placeholder(self, dst_obj):
         are to be related.
         :return: None
         """
-        if not isinstance(self, FluentContentsPage):
-            return
         for src_placeholder in Placeholder.objects.parent(self):
             dst_placeholder = Placeholder.objects.create_for_object(
                 dst_obj,

icekit/publishing/templates/admin/publishing/_change_list_publishing_column.html

@@ -1,16 +1,28 @@
-{% load i18n static %}
+{% load i18n static publishing_tags %}
 <label class="publishing-links">
-	{% if object.has_been_published and published_url %}
-		{% if object.is_dirty %}
-			<a target="_blank" href="{{ draft_url }}" title="Preview draft version"><i class="fa fa-circle-o"></i></a>
-		{% else %}
-			<i class="fa fa-circle-o" style="visibility: hidden;"></i>
-		{% endif %}
-		<a target="_blank" href="{{ published_url }}" title="View published{% if not object.is_dirty %}/latest{% endif %} version"><i class="fa fa-circle"></i></a>
-	{% else %}
-		{% if draft_url %}
-			<a target="_blank" href="{{ draft_url }}" title="Preview draft version"><i class="fa fa-circle-o"></i></a>
-		{% endif %}
-	{% endif %}
-
+    {% with object.get_absolute_url as url %}
+        {% if url %}
+            {% if object.has_been_published %}
+                {% if object.is_dirty %}
+                    <a target="_blank" href="{{ url|get_draft_url }}" title="Preview draft version"><i class="fa fa-circle-o"></i></a>
+                {% else %}
+                    <i class="fa fa-circle-o" style="visibility: hidden;"></i>
+                {% endif %}
+                <a target="_blank" href="{{ url }}" title="{% if object.is_suppressed_message %}{{ object.is_suppressed_message }}{%  else %}View published{% if not object.is_dirty %}/latest{% endif %} version{% endif %}" {% if object.is_suppressed_message %}class="suppressed"{% endif %}><i class="fa fa-circle"></i></a>
+            {% else %}
+                <a target="_blank" href="{{ url|get_draft_url }}" title="Preview draft version"><i class="fa fa-circle-o"></i></a>
+            {% endif %}
+        {% else %}
+            {% if object.has_been_published %}
+                {% if object.is_dirty %}
+                    <i class="fa fa-circle-o"></i>
+                {% else %}
+                    <i class="fa fa-circle-o" style="visibility: hidden;"></i>
+                {% endif %}
+                <i class="fa fa-circle"></i>
+            {% else %}
+                <i class="fa fa-circle-o"></i>
+            {% endif %}
+        {% endif %}
+   {% endwith %}
 </label>

icekit/publishing/templates/admin/publishing/publishing_change_form.html

@@ -16,8 +16,10 @@
 {% block extrahead %}
 	{{ block.super }}
 	<script type="text/javascript">
-		fluent_layouts.ct_id = {{ content_type_id }};
-		fluent_layouts.layout_url = '{% url "admin:icekit_layout_changelist" %}';
+        if (typeof fluent_layouts != 'undefined') {
+            fluent_layouts.ct_id = {{ content_type_id }};
+            fluent_layouts.layout_url = '{% url "admin:icekit_layout_changelist" %}';
+        }
 		var csrf_token = '{{ csrf_token }}';
 	</script>
 	<style>