diff options
Diffstat (limited to 'coip')
-rw-r--r-- | coip/apps/membership/models.py | 5 | ||||
-rw-r--r-- | coip/apps/tag/views.py | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/coip/apps/membership/models.py b/coip/apps/membership/models.py index 0dc06ca..324c736 100644 --- a/coip/apps/membership/models.py +++ b/coip/apps/membership/models.py @@ -10,6 +10,7 @@ import datetime from pprint import pformat import logging from coip.apps.entity.models import Entity +import tagging class Membership(models.Model): ''' @@ -74,4 +75,6 @@ def has_member(name,member_name): if isinstance(member_name,User): return Membership.objects.filter(name=name,user=member_name) else: - return Membership.objects.filter(name=name,entity=member_name)
\ No newline at end of file + return Membership.objects.filter(name=name,entity=member_name) + +tagging.register(Membership)
\ No newline at end of file diff --git a/coip/apps/tag/views.py b/coip/apps/tag/views.py index bcccae3..a08d696 100644 --- a/coip/apps/tag/views.py +++ b/coip/apps/tag/views.py @@ -4,16 +4,23 @@ Created on Mar 3, 2011 @author: jbn ''' from django.core.exceptions import ObjectDoesNotExist -from django.http import HttpResponseNotFound, HttpResponseForbidden, HttpResponseRedirect, Http404 +from django.http import HttpResponse, HttpResponseNotFound, HttpResponseForbidden, HttpResponseRedirect, Http404 from django.contrib.auth.decorators import login_required from coip.multiresponse import respond_to, json_response, render403 import logging from django.shortcuts import get_object_or_404 from django.contrib.auth.models import User from coip.apps.membership.models import Membership +from forms import * +from tagging.models import Tag def add(request, type, id): if type == "membership": tagobj = get_object_or_404(Membership, pk=id) - else: return HttpResponseNotFound() - return respond_to(request,{'text/html': 'apps/tag/add.html'},{'tagobj': tagobj, 'type': type})
\ No newline at end of file + else: return HttpResponseNotFound() + if request.method == 'POST': + if tagobj.user == request.user: + for tag in request.POST.getlist('item[tags][]'): + Tag.objects.add_tag(tagobj, tag) + return HttpResponseRedirect(request.META["HTTP_REFERER"]) + return respond_to(request,{'text/html': 'apps/tag/add.html'},{'tagobj': tagobj, 'type': type, 'name': tagobj.name})
\ No newline at end of file |