Author: batiste.bieler
Date: Thu Feb 19 02:51:13 2009
New Revision: 355
Modified:
trunk/pages/admin/__init__.py
trunk/pages/models.py
trunk/pages/templates/admin/pages/page/menu.html
trunk/pages/templatetags/pages_tags.py
Log:
Remove dead code, cleanup a little bit and fix bug #48
Modified: trunk/pages/admin/__init__.py
==============================================================================
--- trunk/pages/admin/__init__.py (original)
+++ trunk/pages/admin/__init__.py Thu Feb 19 02:51:13 2009
@@ -117,8 +117,6 @@
target = request.GET.get('target', None)
position = request.GET.get('position', None)
- obj.invalidate()
-
if target is not None and position is not None:
try:
target = self.model.objects.get(pk=target)
@@ -147,6 +145,8 @@
else:
Content.objects.set_or_create_content(obj, language,
placeholder.name,
form.cleaned_data[placeholder.name])
+
+ obj.invalidate()
def get_fieldsets(self, request, obj=None):
"""
Modified: trunk/pages/models.py
==============================================================================
--- trunk/pages/models.py (original)
+++ trunk/pages/models.py Thu Feb 19 02:51:13 2009
@@ -99,25 +99,9 @@
def invalidate(self):
"""Invalidate a page and it's descendants"""
-
self.invalidate_if_parent_changed()
cache.delete(self.PAGE_LANGUAGES_KEY % (self.id))
- cache.delete("page_row_admin:%d" % (self.id))
-
- for desc in self.get_descendants():
- cache.delete("page_row_admin:%d" % (desc.id))
- #desc.invalidate_if_parent_changed()
-
- if self.parent:
- for site in self.parent.sites.all():
- cache.delete(self.PAGE_CHILDREN_KEY % (self.parent.id,
site.id))
-
- for site in self.sites.all():
- cache.delete(self.PAGE_CHILDREN_KEY % (self.id, site.id))
-
- #TODO: invalidate the content cache of the page
-
def invalidate_if_parent_changed(self):
"""Invalidate cache depending of a parent"""
@@ -126,6 +110,8 @@
for lang in settings.PAGE_LANGUAGES:
cache.delete(self.PAGE_URL_KEY % (self.id, lang[0]))
cache.delete(self.PAGE_SLUG_KEY % (self.id, lang[0]))
+ cache.delete(self.PAGE_CONTENT_KEY % (self.id,
lang[0], 'title'))
+ cache.delete(self.PAGE_CONTENT_KEY % (self.id,
lang[0], 'slug'))
def get_languages(self):
"""
Modified: trunk/pages/templates/admin/pages/page/menu.html
==============================================================================
--- trunk/pages/templates/admin/pages/page/menu.html (original)
+++ trunk/pages/templates/admin/pages/page/menu.html Thu Feb 19 02:51:13
2009
@@ -53,7 +53,7 @@
{% endif %}
{% if expanded %}
- {% for child in children %}
+ {% for child in page.children.all %}
{% pages_admin_menu child url level %}
{% endfor %}
{% endif %}
Modified: trunk/pages/templatetags/pages_tags.py
==============================================================================
--- trunk/pages/templatetags/pages_tags.py (original)
+++ trunk/pages/templatetags/pages_tags.py Thu Feb 19 02:51:13 2009
@@ -5,6 +5,7 @@
from django.utils.translation import ugettext_lazy as _
from django.template import Template, TemplateSyntaxError
from django.conf import settings as global_settings
+import urllib
from pages import settings
from pages.models import Content, Page
@@ -54,26 +55,15 @@
request = context['request']
site = request.site
- import urllib
if "tree_expanded" in request.COOKIES:
cookie_string = urllib.unquote(request.COOKIES['tree_expanded'])
if cookie_string:
ids = [int(id) for id in
urllib.unquote(request.COOKIES['tree_expanded']).split(',')]
if page.id in ids:
expanded = True
-
- children = cache.get(Page.PAGE_CHILDREN_KEY % (page.id, site.id))
- if children is None:
- children = get_page_children_for_site(page, site)
- cache.set(Page.PAGE_CHILDREN_KEY % (page.id, site.id), children)
has_permission = page.has_page_permission(request)
- # level is used to add a left margin on table row
- if has_permission:
- if level is None:
- level = 0
- else:
- level = level+3
+
return locals()
pages_admin_menu = register.inclusion_tag('admin/pages/page/menu.html',
takes_context=True)(pages_admin_menu)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
