@@ -18,6 +18,8 @@ def get_current_page(path, lang, queryset, home_slug, home_tree_id): returns: (Page, None) or (None, path_to_alternative language) """ try: + if settings.CMS_FLAT_URLS: + return queryset.filter(Q(title_set__slug=path) & Q(title_set__language=lang)).distinct().select_related()[0], None if home_slug: queryset = queryset.exclude(Q(title_set__path=home_slug)&Q(tree_id=home_tree_id)) home_slug += "/" @@ -25,21 +27,18 @@ def get_current_page(path, lang, queryset, home_slug, home_tree_id): else: title_q = Q(title_set__slug=path) - if settings.CMS_FLAT_URLS: - return queryset.filter(title_q & Q(title_set__language=lang)).distinct().select_related()[0], None - else: - page = queryset.filter(title_q).distinct().select_related()[0] - if page: - langs = page.get_languages() - if lang in langs: - return page, None - else: - path = None - for alt_lang in get_fallback_languages(lang): - if alt_lang in langs: - path = '/%s%s' % (alt_lang, page.get_absolute_url(language=lang, fallback=True)) - return None, path - return None, path + page = queryset.filter(title_q).distinct().select_related()[0] + if page: + langs = page.get_languages() + if lang in langs: + return page, None + else: + path = None + for alt_lang in get_fallback_languages(lang): + if alt_lang in langs: + path = '/%s%s' % (alt_lang, page.get_absolute_url(language=lang, fallback=True)) + return None, path + return None, path except IndexError: return None, None cms/views.py 7484fb9f0b2a5a5565bf45beac76315c1b6c7268 7dfa5fb595c1de9fb2cf419c672e44d3620d33be Patrick Lauber patrick.lauber@divio.ch http://github.com/fivethreeo/django-cms-2.0/commit/5078bb8d54fff5b5ac93167147e9cf69dca5cd97 5078bb8d54fff5b5ac93167147e9cf69dca5cd97 2009-11-04T04:26:54-08:00 2009-11-04T04:26:54-08:00 Merge branch 'flaturl' of git://github.com/ulope/django-cms-2.0 into frontedit 842a219d9c542f9cf40e17c15867025f3601cef2 Patrick Lauber patrick.lauber@divio.ch