Changeset 64

Timestamp:

12/27/06 22:48:33 (2 years ago)

Author:

akaihola

Message:

[djac] Fixed 'Show tickets for all sites' crash. Disabled URL verification from trac sites, because closed sites wouldn't be accepted. Fixed urls.py view references.

Location:

djac/trunk

Files:

• models.py (modified) (1 diff)
• urls.py (modified) (1 diff)
• views.py (modified) (1 diff)

djac/trunk/models.py

@@ -31 +31 @@
         help_text=_('The name of the Trac project as used inside Djac.'))
     baseurl = models.URLField(
+        verify_exists=False,
         help_text=_('Base URL of the Trac site, e.g. www.mysite.com/trac/myproject') )
     report_number = models.IntegerField(

djac/trunk/urls.py

@@ -25 +25 @@
 from django.conf.urls.defaults import *
 
-from djac.models import TracSite
+from views import index, tickets
 
 urlpatterns = patterns(
     '',
-    (r'^tickets/(?P<sites_str>.*)/(?P<owners_str>.*)/', 'djac.views.tickets'),
-    (r'^tickets/'          , 'djac.views.tickets'),
-    (r'^$'                 , 'djac.views.index'  ),
+    (r'^tickets/(?P<sites_str>.*)/(?P<owners_str>.*)/', tickets),
+    (r'^tickets/', tickets),
+    (r'^$', index),
 )
     

djac/trunk/views.py

@@ -59 +59 @@
     if request.GET:
         if request.GET.has_key('show_tickets_for_sites'):
-            sites = TracSite.objects.filter(pk__in=request.GET.getlist('sites')).order_by('name')
+            sites = '+'.join(site.name
+                             for site in TracSite.objects.filter(pk__in=request.GET.getlist('sites')).order_by('name'))
         else:
-            sites = 'all_sites',
+            sites = 'all_sites'
         owners = filter(None, re.split(r'\W+', request.GET['owners'])) \
                  or ['all_owners']
         owners.sort()
         return HttpResponseRedirect('./%s/%s/' % (
-            '+'.join(site.name for site in sites), '+'.join(owners)))
+            sites, '+'.join(owners)))
     
     sites = TracSite.objects.all()