Issue 4646 refactor details view

cms/appresolver.py

@@ -6,7 +6,7 @@
 from django.contrib.sites.models import Site
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import (RegexURLResolver, Resolver404, reverse,
-                                      RegexURLPattern)
+                                      RegexURLPattern, resolve)
 from django.db import OperationalError, ProgrammingError
 from django.utils import six
 from django.utils.translation import get_language, override
@@ -182,6 +182,24 @@ def get_patterns_for_title(path, title):
     return url_patterns
 
 
+def get_app_response_for_page(page, language_code, request):
+    """
+    Get the view matching a page and language_code.
+    If no view matches, return nothing or raise Resolver404 (implicitly).
+    """
+    # TODO: I don't understand, why the logic her is so different from
+    # the logic in `get_patterns_for_title`, above.
+    app_urls = page.get_application_urls(language_code, False)
+    if app_urls:
+        app = apphook_pool.get_apphook(app_urls)
+        pattern_list = []
+        if app:
+            for urlpatterns in get_app_urls(app.get_urls(page, language_code)):
+                pattern_list += urlpatterns
+            view, args, kwargs = resolve('/', tuple(pattern_list))
+            return view(request, *args, **kwargs)
+
+
 def get_app_patterns():
     try:
         return _get_app_patterns()

cms/models/pagemodel.py

@@ -1004,6 +1004,7 @@ def get_descendants(self, include_self=False):
             return self.__class__.get_tree(self).exclude(pk=self.pk).filter(site_id=self.site_id)
 
     def get_published_languages(self):
+        # TODO: this function name is misleading.
         if self.publisher_is_draft:
             return self.get_languages()
         return sorted([language for language in self.get_languages() if self.is_published(language)])

cms/utils/__init__.py

@@ -38,10 +38,7 @@ def get_template_from_request(request, obj=None, no_current_page=False):
     return get_cms_setting('TEMPLATES')[0][0]
 
 
-def get_language_from_request(request, current_page=None):
-    """
-    Return the most obvious language according the request
-    """
+def get_desired_language(request, current_page=None):
     language = None
     if hasattr(request, 'POST'):
         language = request.POST.get('language', None)
@@ -57,7 +54,15 @@ def get_language_from_request(request, current_page=None):
     if language:
         if not language in get_language_list(site_id):
             language = None
+    return language
+
 
+def get_language_from_request(request, current_page=None):
+    """
+    Return the most obvious language according the request
+    """
+    language = get_desired_language(request, current_page)
+    site_id = current_page.site_id if current_page else None
     if not language and current_page:
         # in last resort, get the first language available in the page
         languages = current_page.get_languages()

cms/utils/i18n.py

@@ -93,6 +93,15 @@ def get_public_languages(site_id=None):
     return [lang['code'] for lang in get_language_objects(site_id)
             if lang.get('public', True)]
 
+def get_visible_languages(request, site_id=None):
+    """
+    :return: list of iso2codes of languages visible for requset user
+    """
+    if hasattr(request, 'user') and request.user.is_staff:
+        return get_language_list()
+    else:
+        return get_public_languages()
+
 
 def get_language_object(language_code, site_id=None):
     """
@@ -178,3 +187,19 @@ def is_language_prefix_patterns_used():
     """
     return any(isinstance(url_pattern, LocaleRegexURLResolver)
                for url_pattern in get_resolver(None).url_patterns)
+
+
+def complete_i18n_url(url, language_code):
+    """
+    Adds the language prefix if it is required and missing
+    :param url:
+    :param language_code:
+    :return: URL
+    """
+    if (
+        is_language_prefix_patterns_used()
+        and url[0] == "/"
+        and not url.startswith('/%s/' % language_code)
+    ):
+        url = "/%s/%s" % (language_code, url.lstrip("/"))
+    return url