diff options
| author | Johan Berggren <jbn@nordu.net> | 2011-02-24 14:34:07 +0100 |
|---|---|---|
| committer | Johan Berggren <jbn@nordu.net> | 2011-02-24 14:34:07 +0100 |
| commit | 04bb6790d4d455b2bbd56f55363954ce7a7b195b (patch) | |
| tree | 3b7786b0af3a2d8b24556de4df883cc417108acf | |
| parent | 4a4dafe9f8376585dff0579e415b1d885f4f5ae0 (diff) | |
Minor fix to invitations. Need more work.
| -rw-r--r-- | coip/apps/invitation/views.py | 5 | ||||
| -rw-r--r-- | coip/settings.py | 4 | ||||
| -rw-r--r-- | coip/urls.py | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/coip/apps/invitation/views.py b/coip/apps/invitation/views.py index c7fffb9..359d884 100644 --- a/coip/apps/invitation/views.py +++ b/coip/apps/invitation/views.py @@ -45,8 +45,7 @@ def accept(request,nonce): membership.enabled = True membership.save() - for i in Invitation.objects.filter(user=request.user,name=invitation.name).all: - i.delete() + invitation.delete() return HttpResponseRedirect("/membership/%d" % (membership.id)) @@ -68,4 +67,4 @@ def resend(request,id): invitation.send_email() return HttpResponseRedirect("/name/id/%d" % (name.id)) -
\ No newline at end of file + diff --git a/coip/settings.py b/coip/settings.py index e7f7374..703fecb 100644 --- a/coip/settings.py +++ b/coip/settings.py @@ -9,7 +9,7 @@ ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) -BASE_DIR = "/home/leifj/work/sunet.se/coip" +BASE_DIR = "/home/jbn/work/code/coip" MANAGERS = ADMINS DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = '%s/sqlite.db' % BASE_DIR # Or path to database file if using sqlite3. @@ -39,7 +39,7 @@ NOREPLY = 'noreply@localhost' USE_I18N = True MEDIA_ROOT = "%s/site-media" % BASE_DIR -ADMIN_MEDIA_ROOT = "/usr/lib/pymodules/python2.5/django/contrib/admin/media" +ADMIN_MEDIA_ROOT = "/var/lib/virtualenv/brainstorm/lib/python2.6/site-packages/django/contrib/admin/media" MEDIA_URL = '/site-media/' ADMIN_MEDIA_PREFIX = '/admin-media/' diff --git a/coip/urls.py b/coip/urls.py index 78200ce..9904b6e 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -26,6 +26,11 @@ urlpatterns = patterns('', (r'^user/merge/(?P<pkey>.+)$', 'coip.apps.userprofile.views.merge'), (r'^user/merge$', 'coip.apps.userprofile.views.merge'), (r'^user/home$', 'coip.apps.userprofile.views.home'), + # Invitations + (r'^name/(?P<id>[0-9]+)/invite$', 'coip.apps.invitation.views.invite'), + (r'^invitation/(?P<id>[0-9]+)/cancel$', 'coip.apps.invitation.views.cancel'), + (r'^invitation/(?P<id>[0-9]+)/resend$', 'coip.apps.invitation.views.resend'), + (r'^invitation/(?P<nonce>[^\/]+)/accept$', 'coip.apps.invitation.views.accept'), # Names (r'^name/id/(?P<id>[0-9]+)$', 'coip.apps.name.views.show_by_id'), (r'^name$', 'coip.apps.name.views.show_root'), @@ -42,11 +47,6 @@ urlpatterns = patterns('', (r'^link/(?P<id>[0-9]+)/remove$', 'coip.apps.link.views.remove'), # Membership (r'^membership/(?P<id>[0-9]+)$', 'coip.apps.membership.views.show'), - # Invitations - (r'^name/(?P<id>[0-9]+)/invite$', 'coip.apps.invitation.views.invite'), - (r'^invitation/(?P<id>[0-9]+)/cancel$', 'coip.apps.invitation.views.cancel'), - (r'^invitation/(?P<id>[0-9]+)/resend$', 'coip.apps.invitation.views.resend'), - (r'^invitation/(?P<nonce>[^\/]+)/accept$', 'coip.apps.invitation.views.accept'), # JSON Tree (r'^ctree.json$', 'coip.apps.name.views.ctree'), (r'^ctree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.ctree'), |