From 291ec2cfc60684e20b3f7168ba2258a7830f84cc Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 6 Jul 2012 17:49:26 -0400 Subject: [PATCH] Allowing dots in wiki namespaces. --- .../simplewiki/migrations/0004_multicourse_data_migration.py | 2 +- lms/djangoapps/simplewiki/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/simplewiki/migrations/0004_multicourse_data_migration.py b/lms/djangoapps/simplewiki/migrations/0004_multicourse_data_migration.py index 5f12d50611..5f61eb9d1d 100644 --- a/lms/djangoapps/simplewiki/migrations/0004_multicourse_data_migration.py +++ b/lms/djangoapps/simplewiki/migrations/0004_multicourse_data_migration.py @@ -7,7 +7,7 @@ from django.db import models class Migration(DataMigration): def forwards(self, orm): - namespace6002x, created = orm.Namespace.objects.get_or_create(name="6002xS12") + namespace6002x, created = orm.Namespace.objects.get_or_create(name="6.002xS12") if created: namespace6002x.save() diff --git a/lms/djangoapps/simplewiki/urls.py b/lms/djangoapps/simplewiki/urls.py index 4869d394b4..2d01c06bf9 100644 --- a/lms/djangoapps/simplewiki/urls.py +++ b/lms/djangoapps/simplewiki/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import patterns, url -namespace_regex = r"[a-zA-Z\d_-]+" +namespace_regex = r"[a-zA-Z\d._-]+" article_slug = r'/(?P' + namespace_regex + r'/[a-zA-Z\d_-]*)' namespace = r'/(?P' + namespace_regex + r')'