From ed0489bfebee853877c4618f13f2ebc7aff6a37b Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 18 Jan 2011 16:29:26 +0000
Subject: [PATCH] Various live fixes for views and routing issues

---
 groups/urls.py      |  7 +++++--
 groups/views.py     |  4 ----
 settings.py         |  1 -
 start.sh            | 28 ----------------------------
 templates/base.html |  4 ++--
 urls.py             |  7 +++++--
 6 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100755 start.sh

diff --git a/groups/urls.py b/groups/urls.py
index 020023b..da5b379 100644
--- a/groups/urls.py
+++ b/groups/urls.py
@@ -1,9 +1,8 @@
 from django.conf.urls.defaults import *
-
+from django.core.urlresolvers import reverse
 from groups import views
 
 urlpatterns = patterns('',
-    ('^$', views.index),
     (r'^list/$', views.group_list),
     (r'^request/(?P<groupid>\d+)/$', views.create_request),
     (r'^kick/(?P<groupid>\d+)/(?P<userid>\d+)/$', views.kick_member),
@@ -13,3 +12,7 @@ urlpatterns = patterns('',
     (r'^accept/(?P<requestid>\d+)/$', views.accept_request),
     (r'^reject/(?P<requestid>\d+)/$', views.reject_request),
 )
+
+urlpatterns += patterns('django.views.generic.simple',
+    ('^$', 'redirect_to', {'url': reverse('groups.views.group_list')}),
+)
diff --git a/groups/views.py b/groups/views.py
index 38a3f29..ea6d183 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -15,10 +15,6 @@ from groups.forms import GroupRequestForm
 from sso.tasks import update_user_access
 
 
-def index(request):
-    return HttpResponseRedirect(reverse('groups.views.group_list'))
-
-
 @login_required
 def group_list(request):
     """ View all groups, for users only public ones """
diff --git a/settings.py b/settings.py
index 5df4ac4..823e8e7 100755
--- a/settings.py
+++ b/settings.py
@@ -133,7 +133,6 @@ AUTH_PROFILE_MODULE = 'sso.SSOUser'
 LOGIN_REDIRECT_URL = "/profile"
 LOGIN_URL = "/login"
 
-FORCE_SCRIPT_NAME=""
 DEFAULT_FROM_EMAIL = "bot@auth.dredd.it"
 ACCOUNT_ACTIVATION_DAYS = 14
 
diff --git a/start.sh b/start.sh
deleted file mode 100755
index bd142e9..0000000
--- a/start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-ROOT=`pwd`
-PIDROOT=$ROOT/logs
-
-AUTH_PID_FILE="$PIDROOT/auth.pid"
-CELERYD_PID_FILE="$PIDROOT/celeryd.pid"
-
-mkdir logs 2> /dev/null
-
-if [ -f $AUTH_PID_FILE ]; then
-    kill `cat -- $AUTH_PID_FILE` 2> /dev/null
-    rm -f -- $AUTH_PID_FILE
-fi
-
-if [ -f $CELERYD_PID_FILE ]; then
-    kill `cat -- $CELERYD_PID_FILE` 2> /dev/null
-    rm -f -- $CELERYD_PID_FILE
-fi
-
-
-sleep 1
-cd $ROOT
-source ./env/bin/activate
-
-./manage.py celeryd_detach -l INFO -B --pidfile $CELERYD_PID_FILE -f $ROOT/logs/celeryd.log -n auth-processor
-./manage.py runfcgi daemonize=true pidfile=$AUTH_PID_FILE host=127.0.0.1 port=9981 errlog=$ROOT/logs/stderr.log outlog=$ROOT/logs/stdout.log
-#./manage.py celerycam --freq=1.0 &
diff --git a/templates/base.html b/templates/base.html
index 5812018..dd102de 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -17,7 +17,7 @@
             {% if request.user %}
 	           <li><a href="{% url sso.views.profile %}">Profile</a></li>
                 {% if "groups"|installed %}
-                    <li><a href="{% url groups.views.index %}">Groups</a></li>
+                    <li><a href="{% url groups.views.group_list %}">Groups</a></li>
                 {% endif %}
                 {% if "hr"|installed %}
                     <li><a href="{% url hr.views.index %}">HR</a></li>
@@ -25,7 +25,7 @@
                     <li><a href="{% url eve_api.views.eveapi_character %}">Characters</a></li>
                 {% if request.user.is_staff %}
                     <li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
-                    <li><a href="/admin">Admin</a></li>
+                    <li><a href="/admin/">Admin</a></li>
                 {% endif %}
                     <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
             {% else %}
diff --git a/urls.py b/urls.py
index d8f896a..c79c60b 100644
--- a/urls.py
+++ b/urls.py
@@ -18,8 +18,6 @@ urlpatterns = patterns('',
     (r'^eve/', include('eve_api.urls')),
     (r'^eveapi/', include('eve_proxy.urls')),
     (r'^api/', include('api.urls')),
-    (r'^hr/', include('hr.urls')),
-    (r'^groups/', include('groups.urls')),
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
 )
 
@@ -28,6 +26,11 @@ if installed('reddit'):
         ('', include('reddit.urls')),
     )
 
+if installed('hr'):
+    urlpatterns += patterns('',
+        (r'^hr/', include('hr.urls')),
+    )
+
 if installed('groups'):    
     urlpatterns += patterns('',
         (r'^groups/', include('groups.urls')),