From 02fb072aa3fc1b7dc5dc8bc318af9f99fb1148ca Mon Sep 17 00:00:00 2001 From: Alistair Magee Date: Sat, 1 Feb 2014 05:02:24 +0000 Subject: [PATCH] altered plugin to work with updated subcategory plugin --- custom_article_urls/custom_article_urls.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/custom_article_urls/custom_article_urls.py b/custom_article_urls/custom_article_urls.py index 7b8a4e8..e1f1093 100644 --- a/custom_article_urls/custom_article_urls.py +++ b/custom_article_urls/custom_article_urls.py @@ -11,12 +11,6 @@ from pelican import signals from pelican.contents import Content, Category from six import text_type -def recursive_name(self): - if type(self) is Category: - return self.name - else: - return '{}/{}'.format(recursive_name(self.parent), self.name) - def custom_url(generator, metadata): if 'CUSTOM_ARTICLE_URLS' in generator.settings: custom_urls = generator.settings['CUSTOM_ARTICLE_URLS'] @@ -28,9 +22,8 @@ def custom_url(generator, metadata): if 'subcategories' in metadata: #using subcategory plugin for subcategory in metadata['subcategories']: - subcategory_name = recursive_name(subcategory) - if subcategory_name in custom_urls: - pattern_matched = custom_urls[subcategory_name] + if subcategory in custom_urls: + pattern_matched = custom_urls[subcategory] if pattern_matched: #only alter url if hasn't been set in the metdata