diff options
author | Leif Johansson <leifj@sunet.se> | 2011-02-21 22:03:08 +0100 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2011-02-21 22:03:08 +0100 |
commit | eaaa685da22be10c429bda1706add1e442a83640 (patch) | |
tree | 068acb942837b91a75f763a4df2a33766f8d48be | |
parent | edc86859e755d949919d4cf9fd82689ae31e60ef (diff) |
remove broken twisted dependency
-rw-r--r-- | .pydevproject | 2 | ||||
-rw-r--r-- | coip/apps/invitation/views.py | 15 | ||||
-rw-r--r-- | templates/apps/userprofile/home.html | 5 |
3 files changed, 7 insertions, 15 deletions
diff --git a/.pydevproject b/.pydevproject index 3f6940e..734f291 100644 --- a/.pydevproject +++ b/.pydevproject @@ -2,7 +2,7 @@ <?eclipse-pydev version="1.0"?> <pydev_project> -<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">/opt/virtualenv/coip-test/bin/python</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property> <pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION"> <key>DJANGO_MANAGE_LOCATION</key> diff --git a/coip/apps/invitation/views.py b/coip/apps/invitation/views.py index c62a4a6..c7fffb9 100644 --- a/coip/apps/invitation/views.py +++ b/coip/apps/invitation/views.py @@ -6,10 +6,9 @@ Created on Jun 23, 2010 from django.contrib.auth.decorators import login_required from coip.apps.invitation.models import Invitation from coip.apps.invitation.forms import InvitationForm -from django.http import HttpResponseRedirect, Http404 +from django.http import HttpResponseRedirect from coip.apps.auth.utils import nonce from coip.multiresponse import respond_to, render403 -from twisted.python.reflect import ObjectNotFound from coip.apps.name.models import Name import datetime from coip.apps.membership.models import Membership @@ -17,11 +16,7 @@ from django.shortcuts import get_object_or_404 @login_required def invite(request,id): - name = None - try: - name = Name.objects.get(id=id) - except ObjectNotFound: - raise Http404() + name = get_object_or_404(Name,pk=id) if not name.has_permission(request.user,'i'): return render403('You are not allowed to invite users to '+name) @@ -43,11 +38,7 @@ def invite(request,id): @login_required def accept(request,nonce): - invitation = None - try: - invitation = Invitation.objects.get(nonce=nonce) - except ObjectNotFound: - raise Http404() + invitation = get_object_or_404(Invitation,nonce=nonce) (membership,created) = Membership.objects.get_or_create(user=request.user,name=invitation.name) if created or not membership.enabled: diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index 34673db..d7f449d 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -1,4 +1,5 @@ {% extends "tree.html" %} +{% load datehumanize %} {% block widgets %} $("#gravatar").append($.gravatar($('#email').text())); $("#names").accordion({ @@ -19,7 +20,7 @@ <div id="m{{m.id}}" class="{{m.status}}"> <h3 class="listheader">{{m.name.shortname}}</h3> <div> - You have been a member of <a href="/name/id/{{m.name.id}}">{{m.name.shortname}}</a> since {{m.timecreated}} + You became a member of <a href="/name/id/{{m.name.id}}">{{m.name.shortname}}</a> {{m.timecreated|datehumanize}} </div> </div> {% empty %} @@ -32,7 +33,7 @@ <div id="n{{n.id}}"> <h3 class="listheader">{{n.shortname}}</h3> <div> - You are allowed to {{p}} <a href="/name/id/{{n.id}}">{{n.shortname}}</a> + <a href="/name/id/{{n.id}}">{{n.shortname}}</a> </div> </div> {% empty %} |