Merge branch 'master' of git://github.com/philomat/django-cms-2.0

django-cms · Mar 25, 2010 · c37f56c · c37f56c
2 parents 1d3a4b9 + f23f5e2
commit c37f56c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/menus/templates/menu/menu.html b/menus/templates/menu/menu.html
@@ -2,7 +2,7 @@
 {% for child in children %}
 <li class="{% if child.selected %}selected{% endif %}{% if child.ancestor %}ancestor{% endif %}{% if child.sibling %}sibling{% endif %}{% if child.descendant %}descendant{% endif %}">
 	<a href="{{ child.get_absolute_url }}">{{ child.get_menu_title }}</a>
-	{% if child.childrens %}
+	{% if child.children %}
     <ul>
         {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
     </ul>

diff --git a/menus/templatetags/menu_tags.py b/menus/templatetags/menu_tags.py
@@ -35,7 +35,8 @@ def cut_levels(nodes, from_level, to_level, extra_inactive, extra_active):
         if not node.visible:
             removed.append(node)
             if node.parent:
-                node.parent.children.remove(node)
+                if node in node.parent.children:
+                    node.parent.children.remove(node)
     if selected:
         cut_after(selected, extra_active, removed)
     if removed: