restored housekeeping

evildmp · Nov 14, 2011 · d40f01b · d40f01b
1 parent 610c4f1
commit d40f01b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/contacts_and_people/urls.py b/contacts_and_people/urls.py
@@ -22,7 +22,7 @@
     (r'^', include('vacancies_and_studentships.urls')),
 
     # housekeeping
-    # (r'^', include('housekeeping.urls')),
+    (r'^', include('housekeeping.urls')),
 
 
     )

diff --git a/housekeeping/tasks.py b/housekeeping/tasks.py
@@ -9,15 +9,15 @@
 from tidy_links import tidy_links 
 
 @login_required
-def tasks(request, task, action = "dryrun"):
+def tasks(request, task = None, action = "dryrun"):
     report = {}
 
     if task == "convert-placeholders":
         report = convert(action)
     elif task == "tidy-links":
         report = tidy_links(action)
     else:
-        # nothing matched, so just do the menue
+        # nothing matched, so just do the menu
         return shortcuts.render_to_response(
         "housekeeping/housekeeping.html", {
                 "base_template": settings.CMS_TEMPLATES[0][0],

diff --git a/housekeeping/urls.py b/housekeeping/urls.py
@@ -4,8 +4,8 @@
 urlpatterns = patterns('',
     # first, try to match /housekeeping/<task>/<execute>
     (r"^housekeeping/(?P<task>[^/]+)/(?P<action>[^/]+)/$", "housekeeping.tasks.tasks"),
-    # no match? 
-    (r"^housekeeping/", "housekeeping.housekeeping.options"),
+    # # no match? 
+    (r"^housekeeping/", "housekeeping.tasks.tasks"),
 
 
     # (r"^housekeeping/statistics/", "housekeeping.statistics.stats"),