@@ -24,3 +24,7 @@ class PastedItem(models.Model): self.uuid = str(uuid4()) # random so it can't be easily guessed super(PastedItem, self).save() + def get_absolute_url(self): + return ('oxybeles_detail', (), { 'slug': self.uuid }) + get_absolute_url = models.permalink(get_absolute_url) + models.py @@ -1,8 +1,16 @@ from django.conf.urls.defaults import * -from django.views.generic.simple import direct_to_template +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(.)+)/$', 'oxybeles.views.view', name="oxybeles_view"), + 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'), ) urls.py @@ -2,7 +2,7 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponseRedirect, get_host from django.template import RequestContext from django.core.urlresolvers import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext, ugettext_lazy as _ from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required @@ -14,17 +14,20 @@ def new(request, form_class=PastedItemForm, template_name="oxybeles/new.html"): Form for pasting new items. """ form = form_class() - if request.method != 'POST': - return render_to_response(template_name, - { "form": form, }, - context_instance=RequestContext(request)) - if request.POST["action"] == "paste": - form = form_class(request.user, request.POST) - if form.is_valid(): - item = form.save() - request.user.message_set.create( - message=_("Pasted the new item.")) - return HttpResponseRedirect(reverse('oxybeles_view', - args=(item.id,))) + if request.method == 'POST': + if request.POST["action"] == "paste": + form = form_class(request.user, request.POST) + if form.is_valid(): + item = form.save(commit=False) + item.user = request.user + item.save() + request.user.message_set.create( + message=ugettext("The new pasted item was saved.")) + # some problem with ugettext_lazy here + return HttpResponseRedirect(reverse('oxybeles_detail', + args=(item.uuid,))) + return render_to_response(template_name, + { "form": form, }, + context_instance=RequestContext(request)) new = login_required(new) views.py 43f89065ebc8b8845eb03f5761e5ece1782cc121 Fernando Correia fernandoacorreia@gmail.com http://github.com/fernandoacorreia/oxybeles/commit/1af5676234f4ea1a29da3662e57fde92c052b2eb 1af5676234f4ea1a29da3662e57fde92c052b2eb 2008-10-28T16:53:39-07:00 2008-10-28T16:53:39-07:00 Part 5 6da24b03c7cd1673056cac6f26fc0cd6f4adb49a Fernando Correia fernandoacorreia@gmail.com