Merged changes from branch/2.00 r731: Adding a redirect from / to /id…

…tracker/ to match the legacy behaviour. - Legacy-Id: 733
ietf-tools · Jun 28, 2007 · 4cac4d3 · 4cac4d3
1 parent cc4b7aa
commit 4cac4d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ietf/redirects/fixtures/initial_data.xml b/ietf/redirects/fixtures/initial_data.xml
@@ -187,8 +187,8 @@
     <field type="CharField" name="remove"></field>
   </object>
   <object pk="32" model="redirects.redirect">
-    <field type="CharField" name="cgi">dummy/2</field>
-    <field type="CharField" name="url"></field>
+    <field type="CharField" name="cgi"></field>
+    <field type="CharField" name="url">idtracker</field>
     <field type="CharField" name="rest"></field>
     <field type="CharField" name="remove"></field>
   </object>

diff --git a/ietf/urls.py b/ietf/urls.py
@@ -31,7 +31,7 @@
       (r'^meeting/', include('ietf.meeting.urls')),
       (r'^accounts/', include('ietf.ietfauth.urls')),
 
-      (r'^$', ietf.views.apps),
+      (r'^$', 'ietf.redirects.views.redirect'),
 
     # Uncomment this for admin:
      (r'^admin/', include('django.contrib.admin.urls')),