LICENSE management.py templates/notification/pasteditem_received/full.txt templates/notification/pasteditem_received/notice.html templates/notification/pasteditem_received/short.txt templates/notification/pasteditem_sent/full.txt templates/notification/pasteditem_sent/notice.html templates/notification/pasteditem_sent/short.txt @@ -1,7 +1,12 @@ -from django import forms -from django.utils.translation import ugettext_lazy as _ +from django import forms +from django.contrib.auth.models import User +from django.utils.translation import ugettext_lazy as _ +from oxybeles.models import PastedItem -from oxybeles.models import PastedItem +try: + from notification import models as notification +except ImportError: + notification = None class PastedItemForm(forms.ModelForm): class Meta(): @@ -12,3 +17,34 @@ class PastedItemForm(forms.ModelForm): self.user = user super(PastedItemForm, self).__init__(*args, **kwargs) +class SendItemForm(forms.Form): + uuid = forms.CharField(max_length=36) + recipient = forms.CharField(max_length=30) + + def __init__(self, sender = None, *args, **kwargs): + super(SendItemForm, self).__init__(*args, **kwargs) + self.sender = sender + + def clean_uuid(self): + try: + return PastedItem.objects.get(uuid=self.cleaned_data['uuid']) + except PastedItem.DoesNotExist: + raise forms.ValidationError(_("The pasted items was not found.")) + + def clean_recipient(self): + recipient = self.cleaned_data['recipient'] + try: + return User.objects.get(username=recipient) + except User.DoesNotExist: + raise forms.ValidationError("There is no user named %s." % recipient) + + def save(self): + self.pasted_item = self.cleaned_data['uuid'] + self.recipient_user = self.cleaned_data['recipient'] + if notification: + notification.send([self.sender], "pasteditem_sent", + {'pasted_item': self.pasted_item, + 'recipient': self.recipient_user,}) + notification.send([self.recipient_user], "pasteditem_received", + {'pasted_item': self.pasted_item, + 'sender': self.sender,}) forms.py @@ -25,6 +25,6 @@ class PastedItem(models.Model): super(PastedItem, self).save() def get_absolute_url(self): - return ('oxybeles_detail', (), { 'slug': self.uuid }) + return ('oxybeles_detail', (), { 'uuid': self.uuid }) get_absolute_url = models.permalink(get_absolute_url) models.py @@ -1,16 +1,10 @@ from django.conf.urls.defaults import * -from oxybeles.models import PastedItem - -info_dict = { - 'queryset': PastedItem.objects.all(), - 'slug_field': 'uuid', -} urlpatterns = patterns('', - url(r'^$', 'oxybeles.views.new', name='oxybeles_new'), - url(r'^(?P<slug>[-0-9a-f]{36})/$', - 'django.views.generic.list_detail.object_detail', - info_dict, - 'oxybeles_detail'), + url(r'^$', + 'oxybeles.views.new', + name='oxybeles_new'), + url(r'^(?P<uuid>[-0-9a-f]{36})/$', + 'oxybeles.views.detail', + name='oxybeles_detail'), ) - urls.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required from oxybeles.models import PastedItem -from oxybeles.forms import PastedItemForm +from oxybeles.forms import PastedItemForm, SendItemForm def new(request, form_class=PastedItemForm, template_name="oxybeles/new.html"): """ @@ -24,10 +24,26 @@ def new(request, form_class=PastedItemForm, template_name="oxybeles/new.html"): request.user.message_set.create( message=ugettext("The new pasted item was saved.")) # some problem with ugettext_lazy here - return HttpResponseRedirect(reverse('oxybeles_detail', + return HttpResponseRedirect(reverse('oxybeles_detail', args=(item.uuid,))) - return render_to_response(template_name, - { "form": form, }, + return render_to_response(template_name, + { "form": form, }, context_instance=RequestContext(request)) new = login_required(new) +def detail(request, uuid, form_class=SendItemForm, template_name='oxybeles/pasteditem_detail.html'): + form = form_class() + if request.method == 'POST': + if request.POST["action"] == "send": + form = form_class(sender=request.user, data=request.POST) + if form.is_valid(): + form.save() + request.user.message_set.create( + message=ugettext("The pasted item was sent.")) + url = form.pasted_item.get_absolute_url() + return HttpResponseRedirect(url) + pasted_item = get_object_or_404(PastedItem, uuid=uuid) + return render_to_response(template_name, + { 'object': pasted_item, 'form': form }, + context_instance=RequestContext(request)) +detail = login_required(detail) views.py 1af5676234f4ea1a29da3662e57fde92c052b2eb Fernando Correia fernandoacorreia@gmail.com http://github.com/fernandoacorreia/oxybeles/commit/225476e42b28d91fecbd664746afabb91a5fc538 225476e42b28d91fecbd664746afabb91a5fc538 2008-11-08T03:00:32-08:00 2008-11-08T03:00:32-08:00 Part 7 7fc6e019ff0666eebde8436cb5809568da9b7444 Fernando Correia fernandoacorreia@gmail.com