Fix various references to MeetingTopics

publicmeeting/meetings/forms.py

@@ -69,12 +69,12 @@ def clean(self, value):
             tag_names = parse_tags(value)
         except ValueError:
             raise forms.ValidationError(_("Please provide a comma-separated list of tags."))
-        
+
         tags = []
         for tag_name in tag_names:
             tag, created = models.MeetingTopic.objects.get_or_create(name=tag_name)
             tags.append(tag.id)
-        
+
         return tags
 
 
@@ -177,7 +177,7 @@ class MeetingFilters (forms.Form):
     bbox = forms.CharField(required=False, widget=GeoBBInput())
     earliest = forms.DateField(required=False, initial=datetime.date.today, widget=DatepickerInput())
     latest = forms.DateField(required=False, widget=DatepickerInput())
-    tags = forms.ModelMultipleChoiceField(queryset=taggit.models.Tag.objects.all(), to_field_name='slug', required=False)
+    tags = forms.ModelMultipleChoiceField(queryset=models.MeetingTopic.objects.all(), to_field_name='slug', required=False)
 
     def clean(self):
         cleaned_data = super(MeetingFilters, self).clean()

publicmeeting/meetings/models.py

@@ -14,17 +14,17 @@ class CachingManager (models.Manager):
     def get_cache_key(self):
         opts = self.model._meta
         return '.'.join([opts.app_label, opts.module_name])
-    
+
     def cached(self):
         key = self.get_cache_key()
         topics = cache.get(key)
-        
+
         if topics is None:
             topics = self.all()
             cache.set(key, topics)
-        
+
         return topics
-    
+
     def bust_cache(self):
         key = self.get_cache_key()
         cache.delete(key)
@@ -83,23 +83,23 @@ class MeetingTopicManager (CachingManager):
     def all(self):
         return super(MeetingTopicManager, self).all().order_by('name')
 
-        
+
 class MeetingTopic (SlugifiedModelMixin, models.Model):
     name = models.CharField(verbose_name='Topic', max_length=100)
-    
+
     # meetings (reverse)
-    
+
     objects = MeetingTopicManager()
-    
+
     def __unicode__(self):
         return self.name
-    
+
     def get_pre_slug(self):
         return self.name
-    
+
     def save(self, *args, **kwargs):
         super(MeetingTopic, self).save(*args, **kwargs)
-        self.objects.bust_cache()
+        MeetingTopic.objects.bust_cache()
 
 
 class Meeting (SlugifiedModelMixin, TimestampedModelMixin, models.Model):

publicmeeting/meetings/tests/test_views_browse.py

@@ -3,17 +3,16 @@
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.gis.geos import Point
-from taggit.models import Tag
 from nose.tools import *
 
-from meetings.models import Meeting, Venue
+from meetings.models import Meeting, Venue, MeetingTopic
 from meetings.views.browse import MeetingListView
 
 class Test_MeetingListView:
 
     def setup(world):
         Meeting.objects.all().delete()
-        Tag.objects.all().delete()
+        MeetingTopic.objects.all().delete()
         Venue.objects.all().delete()
 
         world.url = reverse('browse_meetings_meeting_list')
@@ -22,9 +21,9 @@ def setup(world):
 
     @istest
     def returns_only_meetings_with_the_specified_tags (world):
-        t1 = Tag.objects.create(name='t1')
-        t2 = Tag.objects.create(name='t2')
-        t3 = Tag.objects.create(name='t3')
+        t1 = MeetingTopic.objects.create(name='t1', slug='t1')
+        t2 = MeetingTopic.objects.create(name='t2', slug='t2')
+        t3 = MeetingTopic.objects.create(name='t3', slug='t3')
 
         m1 = Meeting.objects.create(slug='m1'); m1.tags.add(t1)
         m2 = Meeting.objects.create(slug='m2'); m2.tags.add(t2)

publicmeeting/meetings/views/browse.py

@@ -75,6 +75,7 @@ def get_queryset(self):
         if self.form.is_valid():
             return self.get_meetings(**self.form.cleaned_data)
         else:
+            logging.debug(self.form.errors)
             return []
 
     def get(self, request, *args, **kwargs):
@@ -99,7 +100,7 @@ class MeetingDetailView (views.DetailView):
     model = models.Meeting
     context_object_name = 'meeting'
     template_name = 'browse_meetings-meeting_detail.html'
-    
+
     def get_object(self, queryset=None):
         slug = self.kwargs['slug']
         try: