diff --git a/cms_redirects/admin.py b/cms_redirects/admin.py index c4b8402..5cb9ab4 100644 --- a/cms_redirects/admin.py +++ b/cms_redirects/admin.py @@ -2,7 +2,7 @@ from cms_redirects.models import CMSRedirect class CMSRedirectAdmin(admin.ModelAdmin): - list_display = ('old_path', 'new_path', 'page', 'page_site', 'actual_response_code',) + list_display = ('old_path', 'new_path', 'page', 'page_site', 'site', 'actual_response_code',) list_filter = ('site',) search_fields = ('old_path', 'new_path', 'page') radio_fields = {'site': admin.VERTICAL} diff --git a/cms_redirects/management/commands/import_redirect_csv.py b/cms_redirects/management/commands/import_redirect_csv.py index 83b184e..64247c0 100644 --- a/cms_redirects/management/commands/import_redirect_csv.py +++ b/cms_redirects/management/commands/import_redirect_csv.py @@ -6,6 +6,7 @@ from django.contrib.sites.models import Site from django.core.exceptions import ObjectDoesNotExist +from cms_redirects.models import CMSRedirect class Command(BaseCommand): can_import_settings = True @@ -41,9 +42,15 @@ def execute(self, *args, **options): raise CommandError("No site found, invalid domain: %s" % options["site"]) for row in reader: - print row["Old Url"] - print row["New Url"] - print "*************" + old_url = row["Old Url"] + new_url = row["New Url"] + resp_code = row["Response Code"] + if resp_code not in ['301', '302']: + resp_code = '301' + redirect, created = CMSRedirect.objects.get_or_create(site=current_site, old_path=old_url) + redirect.new_path = new_url + redirect.response_code = resp_code + redirect.save() @@ -52,4 +59,4 @@ def execute(self, *args, **options): - \ No newline at end of file + diff --git a/redirect_demo/settings.py b/redirect_demo/settings.py index 229bd84..948ced1 100644 --- a/redirect_demo/settings.py +++ b/redirect_demo/settings.py @@ -68,11 +68,6 @@ CMS_TEMPLATES = ( ('home.html', gettext('Homepage')), - ('content2.html', gettext('Content')), - ('content.html', gettext('Content (without image)')), - ('content3.html', gettext('Content (without left nav)')), - ('freezgard_base.html', gettext('FreezGard Homepage')), - ('freezgard_content.html', gettext('FreezGard Content')), ) CMS_PLACEHOLDER_CONF = {