backwards compatibility for block/pageblock

ccnmtl · Jul 2, 2015 · 141c42f · 141c42f
1 parent 09c49d8
commit 141c42f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/pagetree/models.py b/pagetree/models.py
@@ -701,7 +701,8 @@ def render(self, **kwargs):
         if hasattr(self.content_object, "template_file"):
             t = get_template(getattr(self.content_object, "template_file"))
             d = kwargs
-            d['block'] = self.content_object
+            d['pageblock'] = self.content_object
+            d['block'] = d['pageblock']
             c = Context(d)
             return t.render(c)
         else:

diff --git a/pagetree/templates/pagetree/edit_page.html b/pagetree/templates/pagetree/edit_page.html
@@ -180,6 +180,7 @@ <h3 style="margin-top: 0;"><a href="{{root.get_edit_url}}">{{section.hierarchy.n
     <p>Drag the <span class="glyphicon glyphicon-resize-vertical"></span> arrows to reorder pageblocks:</p>
 
     {% for pageblock in section.pageblock_set.all %}
+    {% with block=pageblock %}
     <div class="row block-dragger" id="pageblock-{{pageblock.id}}">
 
         <div class="col-md-1 draghandle">
@@ -219,10 +220,12 @@ <h3 style="margin-top: 0;"><a href="{{root.get_edit_url}}">{{section.hierarchy.n
 
 
     </div>
+    {% endwith %}
     {% endfor %}
 
 
     {% for pageblock in section.pageblock_set.all %}
+    {% with block=pageblock %}
     <div class="modal fade block-edit" id="edit-pageblock-{{pageblock.id}}" role="dialog">
         <div class="modal-dialog">
             <div class="modal-content">
@@ -261,6 +264,7 @@ <h3>Edit {{pageblock.block.display_name}}</h3>
                 </form>
         </div></div>
     </div>
+    {% endwith %}
     {% endfor %}
 
     {% else %}

diff --git a/pagetree/templates/pagetree/page.html b/pagetree/templates/pagetree/page.html
@@ -3,13 +3,17 @@
 
 {% block js %}
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 {% renderjs pageblock %}
+{% endwith %}
 {% endfor %}
 {% endblock %}
 
 {% block css %}
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 {% rendercss pageblock %}
+{% endwith %}
 {% endfor %}
 {% endblock %}
 
@@ -59,10 +63,12 @@ <h3>Sections</h3>
 
 
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 <div class="pageblock{% if pageblock.css_extra %} {{pageblock.css_extra}}{% endif %}">
 {% if pageblock.label %}<h3>{{pageblock.label}}</h3>{% endif %}
 {% render pageblock %}
 </div>
+{% endwith %}
 {% endfor %}
 
 

diff --git a/pagetree/templates/pagetree/test_page.html b/pagetree/templates/pagetree/test_page.html
@@ -2,13 +2,17 @@
 
 {% block js %}
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 {% renderjs pageblock %}
+{% endwith %}
 {% endfor %}
 {% endblock %}
 
 {% block css %}
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 {% rendercss pageblock %}
+{% endwith %}
 {% endfor %}
 {% endblock %}
 
@@ -56,10 +60,12 @@ <h3>Sections</h3>
 
 
 {% for pageblock in section.pageblock_set.all %}
+{% with block=pageblock %}
 <div class="pageblock{% if pageblock.css_extra %} {{pageblock.css_extra}}{% endif %}">
 {% if pageblock.label %}<h3>{{pageblock.label}}</h3>{% endif %}
 {% render block %}
 </div>
+{% endwith %}
 {% endfor %}