mango r230 - in branches/django: . mango www

[ovitters svn gnome org]

Author: ovitters
Date: Sun Jun 22 20:48:52 2008
New Revision: 230
URL: http://svn.gnome.org/viewvc/mango?rev=230&view=rev

Log:
	* mango/views.py (edit_mirror, list_foundationmembers): Make use of
	get_object_or_404. Also give 404 error message when invalid page was
	given.
	* www/list_foundationmembers.xsl: Make script variable '.'. This as
	Django appears as directories.


Modified:
   branches/django/   (props changed)
   branches/django/ChangeLog
   branches/django/mango/views.py
   branches/django/www/list_foundationmembers.xsl

Modified: branches/django/mango/views.py
==============================================================================
--- branches/django/mango/views.py	(original)
+++ branches/django/mango/views.py	Sun Jun 22 20:48:52 2008
@@ -1,7 +1,8 @@
 from django.http import HttpResponse, Http404, HttpResponseServerError
 from django.conf import settings
-from django.core.paginator import QuerySetPaginator
+from django.core.paginator import InvalidPage, QuerySetPaginator
 from django.db.models import Q
+from django.shortcuts import get_object_or_404
 import datetime
 
 import ldap
@@ -180,10 +181,7 @@
     doc, root = get_xmldoc('Update mirror', request)
     el = ET.SubElement(root, 'updateftpmirror')
 
-    try:
-        mirror = models.Ftpmirrors.objects.get(pk=pk)
-    except mango.models.DoesNotExist:
-        raise Http404()
+    mirror = get_object_or_404(models.Ftpmirrors.objects, pk=pk)
 
     if request.method == 'POST':
         f = models.FtpmirrorsForm(request.POST, instance=mirror)
@@ -197,11 +195,12 @@
     doc, root = get_xmldoc('List Foundation Members', request)
     el1 = ET.SubElement(root, 'listfoundationmembers')
 
-    page_num = request.GET.get('page', 1)
-
     members = models.Foundationmembers.objects.all()
     paginator = QuerySetPaginator(members, 25)
-    page = paginator.page(page_num)
+    try:
+        page = paginator.page(request.GET.get('page', 1))
+    except InvalidPage:
+        raise Http404('Invalid page')
     add_paginator_to_xml(el1, page)
     for member in page.object_list:
         membernode = ET.SubElement(el1, 'foundationmember')

Modified: branches/django/www/list_foundationmembers.xsl
==============================================================================
--- branches/django/www/list_foundationmembers.xsl	(original)
+++ branches/django/www/list_foundationmembers.xsl	Sun Jun 22 20:48:52 2008
@@ -7,7 +7,7 @@
   
   <xsl:include href="common.xsl" />
 
-  <xsl:variable name="script" select="'list_foundationmembers.php'"/>
+  <xsl:variable name="script" select="'.'"/>
 
   <xsl:template match="listfoundationmembers">
    <xsl:apply-templates select="error"/>