Merge branch 'master' of https://github.com/bobkarreman/django-cms into bobkarreman-master

Author: Chris Glass

cms/middleware/multilingual.py

@@ -24,9 +24,7 @@ def get_language_from_request (self,request):
         prefix = has_lang_prefix(request.path_info)
         pages_root = urllib.unquote(reverse("pages-root"))
         if prefix:
-            request.path = request.path.split("/")
-            del request.path[pages_root.count('/')]
-            request.path = "/".join(request.path)
+            request.path = "/" + "/".join(request.path.split("/")[2:])
             request.path_info = "/" + "/".join(request.path_info.split("/")[2:])
             t = prefix
             if t in SUPPORTED:
@@ -111,14 +109,14 @@ def process_response(self, request, response):
             ))
 
             # Documentation comments for HREF_URL_FIX_RE above explain each match group (\1, \4, \5) represents.
-            decoded_response = HREF_URL_FIX_RE.sub(ur'<a\1href="%s%s/\4"\5>' % (pages_root, request.LANGUAGE_CODE), decoded_response)
+            decoded_response = HREF_URL_FIX_RE.sub(ur'<a\1href="/%s%s\4"\5>' % (request.LANGUAGE_CODE, pages_root), decoded_response)
             response.content = FORM_URL_FIX_RE.sub(ur'<form\1action="%s%s/\4"\5>' % (pages_root, request.LANGUAGE_CODE), decoded_response).encode("utf8")
 
         if (response.status_code == 301 or response.status_code == 302 ):
             location = response['Location']
             if not has_lang_prefix(location) and location.startswith("/") and \
                     not location.startswith(settings.MEDIA_URL) and \
                     not location.startswith(settings.ADMIN_MEDIA_PREFIX):
-                response['Location'] = "%s%s%s" % (pages_root, language, location[len(pages_root)-1:])
+                response['Location'] = "/%s%s" % (language, location)
         response.set_cookie("django_language", language)
         return response

cms/tests/__init__.py

@@ -10,6 +10,7 @@
 from cms.tests.permmod import PermissionModeratorTestCase
 from cms.tests.site import SiteTestCase
 from cms.tests.navextender import NavExtenderTestCase
+from cms.tests.nonroot import NonRootCase
 from cms.tests.plugins import PluginsTestCase
 from cms.tests.menu import MenusTestCase
 from cms.tests.rendering import RenderingTestCase
@@ -36,6 +37,7 @@ def suite():
 
     s.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(SiteTestCase))
     s.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(NavExtenderTestCase))
+    s.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(NonRootCase))
     if "cms.plugins.text" in settings.INSTALLED_APPS:
         s.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(PluginsTestCase))
         if "reversion" in settings.INSTALLED_APPS:

cms/tests/base.py

@@ -2,10 +2,12 @@
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.handlers.wsgi import WSGIRequest
+from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
 from django.test.testcases import TestCase
 import copy
 import sys
+import urllib
 import warnings
 
 URL_CMS_PAGE = "/admin/cms/page/"
@@ -56,7 +58,7 @@ def showWarning(message, category, filename, lineno, file=None, line=None):
 
 class CMSTestCase(TestCase):
     counter = 1
-        
+
     def _pre_setup(self):
         """We are doing a lot of setting modifications in our tests, this 
         mechanism will restore to original settings after each test case.
@@ -200,16 +202,23 @@ def reload_page(self, page):
         page = self.assertObjectExist(Page.objects, id=page.pk)
         return page 
 
-    
-    def get_context(self, path="/"):
+    def get_pages_root(self):
+        return urllib.unquote(reverse("pages-root"))
+        
+    def get_context(self, path=None):
+        if not path:
+            path = self.get_pages_root()
         context = {}
         request = self.get_request(path)
 
         context['request'] = request
 
         return context   
 
-    def get_request(self, path="/"):
+    def get_request(self, path=None):
+        if not path:
+            path = self.get_pages_root()
+
         environ = {
             'HTTP_COOKIE':      self.client.cookies,
             'PATH_INFO':         path,

cms/tests/menu.py

@@ -9,7 +9,6 @@
 from menus.menu_pool import menu_pool
 from menus.base import NavigationNode
 
-
 class MenusTestCase(CMSTestCase):
 
     def setUp(self):
@@ -58,7 +57,7 @@ def create_some_nodes(self):
 
     def test_01_basic_cms_menu(self):
         self.assertEqual(len(menu_pool.menus), 1)
-        response = self.client.get("/")
+        response = self.client.get(self.get_pages_root())
         self.assertEquals(response.status_code, 200)
         request = self.get_request()
 
@@ -78,7 +77,7 @@ def test_02_show_menu(self):
         self.assertEqual(nodes[0].descendant, False)
         self.assertEqual(nodes[0].children[0].descendant, True)
         self.assertEqual(nodes[0].children[0].children[0].descendant, True)
-        self.assertEqual(nodes[0].get_absolute_url(), "/")
+        self.assertEqual(nodes[0].get_absolute_url(), self.get_pages_root())
         self.assertEqual(nodes[1].get_absolute_url(), self.page4.get_absolute_url())
         self.assertEqual(nodes[1].sibling, True)
         self.assertEqual(nodes[1].selected, False)
@@ -167,7 +166,7 @@ def test_10_show_breadcrumb(self):
         context = self.get_context(path=self.page2.get_absolute_url())
         nodes = show_breadcrumb(context)['ancestors']
         self.assertEqual(len(nodes), 2)
-        self.assertEqual(nodes[0].get_absolute_url(), "/")
+        self.assertEqual(nodes[0].get_absolute_url(), self.get_pages_root())
         self.assertEqual(isinstance(nodes[0], NavigationNode), True)
         self.assertEqual(nodes[1].get_absolute_url(), page2.get_absolute_url())
 
@@ -228,8 +227,8 @@ def test_15_home_not_in_menu(self):
         context = self.get_context()
         nodes = show_menu(context, 0, 100, 100, 100)['children']
         self.assertEqual(len(nodes), 1)
-        self.assertEqual(nodes[0].get_absolute_url(), "/%s/" % self.page2.get_slug())
-        self.assertEqual(nodes[0].children[0].get_absolute_url(), "/%s/%s/" % (self.page2.get_slug(), self.page3.get_slug()))
+        self.assertEqual(nodes[0].get_absolute_url(), "%s%s/" % (self.get_pages_root(), self.page2.get_slug()))
+        self.assertEqual(nodes[0].children[0].get_absolute_url(), "%s%s/%s/" % (self.get_pages_root(), self.page2.get_slug(), self.page3.get_slug()))
         page4 = Page.objects.get(pk=self.page4.pk)
         page4.in_navigation = True
         page4.save()

cms/tests/nonroot.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+from django.conf import settings
+from django.contrib.auth.models import User
+from cms.tests.base import CMSTestCase
+from cms.tests.menu import MenusTestCase
+from cms.models import Page
+from menus.templatetags.menu_tags import show_menu, show_breadcrumb
+from menus.menu_pool import menu_pool
+from menus.base import NavigationNode
+
+class NonRootCase(CMSTestCase):
+    urls = 'nonroot_urls'
+
+    def setUp(self):
+        settings.CMS_MODERATOR = False
+        u = User(username="test", is_staff = True, is_active = True, is_superuser = True)
+        u.set_password("test")
+        u.save()
+        self.login_user(u)
+
+        self.create_some_pages()
+        
+    # def tearDown(self):
+    #     menu_pool.menus = self.old_menu
+
+    def create_some_pages(self):
+        """
+        Creates the following structure:
+        
+        + P1
+        | + P2
+        |   + P3
+        + P4
+        | + P5
+
+        """
+        self.page1 = self.create_page(parent_page=None, published=True, in_navigation=True)
+        self.page2 = self.create_page(parent_page=self.page1, published=True, in_navigation=True)
+        self.page3 = self.create_page(parent_page=self.page2, published=True, in_navigation=True)
+        self.page4 = self.create_page(parent_page=None, published=True, in_navigation=True)
+        self.all_pages = [self.page1, self.page2, self.page3, self.page4]
+        self.top_level_pages = [self.page1, self.page4]
+        self.level1_pages = [self.page2]
+        self.level2_pages = [self.page3]
+        
+
+    def test_01_basic_cms_menu(self):
+        response = self.client.get(self.get_pages_root())
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(self.get_pages_root(), "/content/")
+
+    def test_02_show_menu(self):
+        context = self.get_context()
+        nodes = show_menu(context)['children']
+        self.assertEqual(nodes[0].get_absolute_url(), self.get_pages_root())
+        self.assertEqual(nodes[0].get_absolute_url(), "/content/")
+
+    def test_03_show_breadcrumb(self):
+        page2 = Page.objects.get(pk=self.page2.pk)
+        context = self.get_context(path=self.page2.get_absolute_url())
+        nodes = show_breadcrumb(context)['ancestors']
+        self.assertEqual(nodes[0].get_absolute_url(), self.get_pages_root())
+        self.assertEqual(nodes[0].get_absolute_url(), "/content/")
+        self.assertEqual(isinstance(nodes[0], NavigationNode), True)
+        self.assertEqual(nodes[1].get_absolute_url(), page2.get_absolute_url())

cms/tests/page.py

@@ -73,7 +73,7 @@ def test_04_details_view(self):
         Test the details view
         """
         try:
-            response = self.client.get('/')
+            response = self.client.get(self.get_pages_root())
         except TemplateDoesNotExist, e:
             if e.args != ('404.html',):
                 raise
@@ -83,7 +83,7 @@ def test_04_details_view(self):
         response = self.client.post(URL_CMS_PAGE_ADD, page_data)
         self.assertRedirects(response, URL_CMS_PAGE)
         try:
-            response = self.client.get('/')
+            response = self.client.get(self.get_pages_root())
         except TemplateDoesNotExist, e:
             if e.args != ('404.html',):
                 raise
@@ -93,7 +93,7 @@ def test_04_details_view(self):
         response = self.client.post(URL_CMS_PAGE_ADD, page_data)
         response = self.client.get(URL_CMS_PAGE)
 
-        response = self.client.get('/')
+        response = self.client.get(self.get_pages_root())
         self.assertEqual(response.status_code, 200)
 
     def test_05_edit_page(self):
@@ -191,20 +191,20 @@ def test_10_move_page(self):
         # check page2 path and url
         page2 = Page.objects.get(pk=page2.pk)
         self.assertEqual(page2.get_path(), page_data1['slug']+"/"+page_data2['slug'])
-        self.assertEqual(page2.get_absolute_url(), "/"+page_data1['slug']+"/"+page_data2['slug']+"/")
+        self.assertEqual(page2.get_absolute_url(), self.get_pages_root()+page_data1['slug']+"/"+page_data2['slug']+"/")
         # check page3 path and url
         page3 = Page.objects.get(pk=page3.pk)
         self.assertEqual(page3.get_path(), page_data1['slug']+"/"+page_data2['slug']+"/"+page_data3['slug'])
-        self.assertEqual(page3.get_absolute_url(), "/"+page_data1['slug']+"/"+page_data2['slug']+"/"+page_data3['slug']+"/")
+        self.assertEqual(page3.get_absolute_url(), self.get_pages_root()+page_data1['slug']+"/"+page_data2['slug']+"/"+page_data3['slug']+"/")
         # publish page 1 (becomes home)
         page1 = Page.objects.all()[0]
         page1.published = True
         page1.save()
         # check that page2 and page3 url have changed
         page2 = Page.objects.get(pk=page2.pk)
-        self.assertEqual(page2.get_absolute_url(), "/"+page_data2['slug']+"/")
+        self.assertEqual(page2.get_absolute_url(), self.get_pages_root()+page_data2['slug']+"/")
         page3 = Page.objects.get(pk=page3.pk)
-        self.assertEqual(page3.get_absolute_url(), "/"+page_data2['slug']+"/"+page_data3['slug']+"/")
+        self.assertEqual(page3.get_absolute_url(), self.get_pages_root()+page_data2['slug']+"/"+page_data3['slug']+"/")
         # move page2 back to root and check path of 2 and 3
         response = self.client.post("/admin/cms/page/%s/move-page/" % page2.pk, {"target":page1.pk, "position":"left" })
         self.assertEqual(response.status_code, 200)

cms/tests/permmod.py

@@ -612,8 +612,8 @@ def test_16_patricks_move(self):
         self.assertEqual(pg.publisher_public != None, True)
 
         # check urls
-        self.assertEqual(pg.publisher_public.get_absolute_url(), u'/master/slave-home/pb/pe/pg/')
-        self.assertEqual(ph.publisher_public.get_absolute_url(), u'/master/slave-home/pb/pe/ph/')
+        self.assertEqual(pg.publisher_public.get_absolute_url(), u'%smaster/slave-home/pb/pe/pg/' % self.get_pages_root())
+        self.assertEqual(ph.publisher_public.get_absolute_url(), u'%smaster/slave-home/pb/pe/ph/' % self.get_pages_root())
 
         # perform movings under slave...
         self.login_user(self.user_slave)
@@ -631,8 +631,8 @@ def test_16_patricks_move(self):
         ph = self.reload_page(ph)
 
         # check urls - they should stay them same, there wasn't approved yet
-        self.assertEqual(pg.publisher_public.get_absolute_url(), u'/master/slave-home/pb/pe/pg/')
-        self.assertEqual(ph.publisher_public.get_absolute_url(), u'/master/slave-home/pb/pe/ph/')
+        self.assertEqual(pg.publisher_public.get_absolute_url(), u'%smaster/slave-home/pb/pe/pg/' % self.get_pages_root())
+        self.assertEqual(ph.publisher_public.get_absolute_url(), u'%smaster/slave-home/pb/pe/ph/' % self.get_pages_root())
 
         # pg & pe should require approval
         self.assertEqual(pg.requires_approvement(), True)
@@ -652,8 +652,8 @@ def test_16_patricks_move(self):
         self.assertEqual(ph.publisher_public.parent.pk, pe.publisher_public_id)
 
         # check if urls are correct after move
-        self.assertEqual(pg.publisher_public.get_absolute_url(), u'/master/slave-home/pc/pg/')
-        self.assertEqual(ph.publisher_public.get_absolute_url(), u'/master/slave-home/pc/pg/pe/ph/')     
+        self.assertEqual(pg.publisher_public.get_absolute_url(), u'%smaster/slave-home/pc/pg/' % self.get_pages_root())
+        self.assertEqual(ph.publisher_public.get_absolute_url(), u'%smaster/slave-home/pc/pg/pe/ph/' % self.get_pages_root())     
 
     def test_17_plugins_get_published(self):
         self.login_user(self.user_super)

cms/utils/__init__.py

@@ -3,8 +3,10 @@
 from django.template import RequestContext
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
+from django.core.urlresolvers import reverse
 
 from cms.utils.i18n import get_default_language
+import urllib
 
 # !IMPORTANT: Page cant be imported here, because we will get cyclic import!!
 
@@ -97,6 +99,8 @@ def get_page_from_request(request):
     """
     tries to get a page from a request if the page hasn't been handled by the cms urls.py
     """
+
+    # TODO: Looks redundant this is also checked in cms.middleware.page and thats the only place this method get called
     if hasattr(request, '_current_page_cache'):
         return request._current_page_cache
     else:
@@ -109,7 +113,8 @@ def get_page_from_request(request):
         if path.startswith('/admin/'):
             kw['page_id']=path.split("/")[0]
         else:
-            kw['slug']=path[1:-1]
+            pages_root = urllib.unquote(reverse("pages-root"))
+            kw['slug']=path[len(pages_root):-1]
         resp = details(request, no404=True, only_context=True, **kw)
         return resp['current_page']
 

menus/templatetags/menu_tags.py

@@ -1,10 +1,11 @@
+import urllib
 from menus.menu_pool import menu_pool
 from django.contrib.sites.models import Site
 from django import template
 from django.conf import settings
 from django.utils.translation import activate, get_language, ugettext
 from django.core.cache import cache
-
+from django.core.urlresolvers import reverse
 
 class NOT_PROVIDED: pass
 
@@ -101,7 +102,7 @@ def show_menu(context, from_level=0, to_level=100, extra_inactive=0, extra_activ
             nodes = new_nodes
         children = cut_levels(nodes, from_level, to_level, extra_inactive, extra_active)
         children = menu_pool.apply_modifiers(children, request, namespace, root_id, post_cut=True)
-    
+
     try:
         context.update({'children':children,
                         'template':template,
@@ -179,8 +180,7 @@ def show_breadcrumb(context, start_level=0, template="menu/breadcrumb.html", onl
     for node in nodes:
         if node.selected:
             selected = node
-        # find home: TODO: maybe home is not on "/"?
-        if node.get_absolute_url() == "/":
+        if node.get_absolute_url() == urllib.unquote(reverse("pages-root")):
             home = node
     if selected and selected != home:
         n = selected
@@ -288,10 +288,8 @@ def page_language_url(context, lang):
         if page == "dummy":
             return ''
         try:
-            from django.core.urlresolvers import reverse
-            root = reverse('pages-root')
             url = page.get_absolute_url(language=lang, fallback=False)
-            url = root + lang + "/" + url[len(root):] 
+            url = "/" + lang + url
         except:
             # no localized path/slug. 
             url = ''

tests/testapp/nonroot_urls.py

@@ -0,0 +1,23 @@
+from django.conf import settings
+from django.conf.urls.defaults import handler500, handler404, patterns, include, \
+    url
+from django.contrib import admin
+
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    (r'^admin/', include(admin.site.urls)),
+    (r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
+    # just for testing - native way to sampleapp urls 
+    # (r'^sampleapp-native/', include('sampleapp.urls')),
+)
+
+if settings.DEBUG:
+    urlpatterns+= patterns('',
+        url(r'^media/cms/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.CMS_MEDIA_ROOT, 'show_indexes': True}),
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True})
+    )
+
+urlpatterns += patterns('',
+    url(r'^content/', include('cms.urls')),
+)