cleanup

cms/menu.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
 from cms.apphook_pool import apphook_pool
-from cms.models import Page
 from cms.models.permissionmodels import (ACCESS_DESCENDANTS,
     ACCESS_PAGE_AND_DESCENDANTS, ACCESS_CHILDREN, ACCESS_PAGE_AND_CHILDREN, ACCESS_PAGE)
 from cms.models.permissionmodels import PagePermission, GlobalPagePermission
@@ -34,13 +33,12 @@ def get_visible_pages(request, pages, site=None):
     is_auth_user = request.user.is_authenticated()
     visible_page_ids = []
     restricted_pages = defaultdict(list)
-    pages_perms_q = Q(can_view=True)
-    page_permissions = PagePermission.objects.filter(pages_perms_q).distinct().select_related('page', 'group__users')
+    page_permissions = PagePermission.objects.filter(can_view=True).select_related('page', 'group__users')
 
     for perm in page_permissions:
 
         # collect the pages that are affected by permissions
-        if site and perm.page.site_id!=site.pk:
+        if site and perm.page.site_id != site.pk:
             continue
         if perm is not None and perm not in restricted_pages[perm.page.pk]:
             # affective restricted pages gathering

cms/models/managers.py

@@ -21,9 +21,7 @@ def get_query_set(self):
         return PageQuerySet(self.model)
 
     def drafts(self):
-        return super(PageManager, self).drafts()#.exclude(
-        #publisher_state=self.model.PUBLISHER_STATE_DELETE
-        #)
+        return super(PageManager, self).drafts()
 
     def public(self):
         return super(PageManager, self).public().exclude(
@@ -69,21 +67,6 @@ def published(self, site=None):
     def expired(self):
         return self.drafts().expired()
 
-    #    - seems this is not used anymore...
-    #    def get_pages_with_application(self, path, language):
-    #        """Returns all pages containing application for current path, or
-    #        any parrent. Returned list is sorted by path length, longer path first.
-    #        """
-    #        paths = levelize_path(path)
-    #        q = Q()
-    #        for path in paths:
-    #            # build q for all the paths
-    #            q |= Q(title_set__path=path, title_set__language=language)
-    #        app_pages = self.published().filter(q & Q(title_set__application_urls__gt='')).distinct()
-    #        # add proper ordering
-    #        app_pages.query.order_by.extend(('LENGTH(`cms_title`.`path`) DESC',))
-    #        return app_pages
-
     def get_all_pages_with_application(self):
         """Returns all pages containing applications for all sites.