From 17b2fe375cea00dbcd160cd72edeec6f2cae7288 Mon Sep 17 00:00:00 2001 From: Dario Marcelino Date: Wed, 27 Dec 2017 17:20:48 +0000 Subject: [PATCH] Remove model.url and model.get_url_parts() patches since there no need to use .specific anymore --- .../patch_wagtailadmin.py | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/wagtail_modeltranslation/patch_wagtailadmin.py b/wagtail_modeltranslation/patch_wagtailadmin.py index 4c87263..ada0eec 100644 --- a/wagtail_modeltranslation/patch_wagtailadmin.py +++ b/wagtail_modeltranslation/patch_wagtailadmin.py @@ -107,9 +107,6 @@ class WagtailTranslator(object): # OVERRIDE PAGE METHODS model.set_url_path = _new_set_url_path model.route = _new_route - model.get_site_root_paths = _new_get_site_root_paths - model.relative_url = _new_relative_url - model.url = _new_url _patch_clean(model) if not model.save.__name__.startswith('localized'): @@ -289,61 +286,6 @@ def _new_route(self, request, path_components): raise Http404 -@staticmethod -def _new_get_site_root_paths(): - """ - Return a list of (root_path, root_url) tuples, most specific path first - - used to translate url_paths into actual URLs with hostnames - - Same method as Site.get_site_root_paths() but without cache - - TODO: remake this method with cache and think of his integration in - Site.get_site_root_paths() - """ - result = [ - (site.id, site.root_page.specific.url_path, site.root_url) - for site in Site.objects.select_related('root_page').order_by('-root_page__url_path') - ] - - return result - - -def _new_relative_url(self, current_site): - """ - Return the 'most appropriate' URL for this page taking into account the site we're currently on; - a local URL if the site matches, or a fully qualified one otherwise. - Return None if the page is not routable. - - Override for using custom get_site_root_paths() instead of - Site.get_site_root_paths() - """ - for (id, root_path, root_url) in self.get_site_root_paths(): - if self.url_path.startswith(root_path): - return ('' if current_site.id == id else root_url) + reverse('wagtail_serve', - args=(self.specific.url_path[len(root_path):],)) - - -@property -def _new_url(self): - """ - Return the 'most appropriate' URL for referring to this page from the pages we serve, - within the Wagtail backend and actual website templates; - this is the local URL (starting with '/') if we're only running a single site - (i.e. we know that whatever the current page is being served from, this link will be on the - same domain), and the full URL (with domain) if not. - Return None if the page is not routable. - - Override for using custom get_site_root_paths() instead of - Site.get_site_root_paths() - """ - root_paths = self.get_site_root_paths() - - for (id, root_path, root_url) in root_paths: - if self.url_path.startswith(root_path): - return ('' if len(root_paths) == 1 else root_url) + reverse( - 'wagtail_serve', args=(self.url_path[len(root_path):],)) - - def _validate_slugs(page): """ Determine whether the given slug is available for use on a child page of