merged

itf/bestpractices/models.py

@@ -35,7 +35,7 @@ class BestPractice(ItfModel):
 
 
 
-  def info_dict(self):
+  def info_dict(self, request=None):
     return {
       'id': self.id,
       'title': self.title,
@@ -134,7 +134,7 @@ class BestPracticeFAQ(ItfModel):
       'answer': self.answer,
     }
 
-  def info_dict(self):
+  def info_dict(self, request=None):
     return {
       'id': self.id,
       'question': self.question,
@@ -211,7 +211,7 @@ class Guideline(ItfModel):
       'title': self.title,
     }
 
-  def info_dict(self):
+  def info_dict(self, request=None):
     return {
       'id': self.id,
       'title': self.title,
@@ -241,7 +241,7 @@ class Glossary(ItfModel):
       'definition': self.definition
     }  
 
-  def info_dict(self):
+  def info_dict(self, request=None):
     return self.list_dict()
 
   def __unicode__(self):

itf/events/models.py

@@ -91,7 +91,7 @@ class Event(ItfModel):
         if self.groups.all():
             groups= {
             'venue': [ obj.group for obj in self.groupevent_set.filter(typ='venue')],           
-            'performing':  [ obj.group for obj in self.groupevent_set.filter(typ='performing')]
+            'performing':  [ obj.group for obj in self.groupevent_set.filter(typ='performing')],
             'organizers':  [ obj.group for obj in self.groupevent_set.filter(typ='organizers')]
             }
             rdict['groups']= groups

itf/festival/models.py

@@ -60,7 +60,7 @@ class Meeting(ItfModel):
     else:
         return None
 
-  def info_dict(self):
+  def info_dict(self, request):
     meeting_data = {}
     meeting_data['meeting'] =  self
     meeting_id = self.id
@@ -116,7 +116,7 @@ class Participant(ItfModel):
       'title': self.name
     }
 
-  def info_dict(self):
+  def info_dict(self, request):
     return {
       'id': self.id,
       'name': self.name,
@@ -276,7 +276,7 @@ class DocumentSubject(ItfModel):
       'title': self.title
     }
 
-  def info_dict(self):
+  def info_dict(self, request):
     return {
       'id': self.id,
       'title': self.title,
@@ -312,7 +312,7 @@ class Document(ItfModel):
       'title': self.title
     }
 
-  def info_dict(self):
+  def info_dict(self, request):
     return self.preview_dict()
 
   def __unicode__(self):
@@ -341,7 +341,7 @@ class Project(ItfModel):
       'intro': self.intro
     }
 
-  def info_dict(self):
+  def info_dict(self, request):
     return self.preview_dict()
 
   def list_dict(self):

itf/frontpage/views.py

@@ -40,7 +40,7 @@ def index(request):
       statuses = tApi.GetUserTimeline(TWITTER_ID)[0:3]
     except:
       statuses = []
-    boxes = SliderBox.objects.all()
+    boxes = SliderBox.objects.filter(is_displayed=True)
     front_images = FrontImage.objects.filter(is_active=True)[0:3]
     return render_to_response("noel/index.html", RequestContext(request, {
         'tweets': [urlize(s.text) for s in statuses],

itf/scriptbank/models.py

@@ -138,7 +138,7 @@ class License(ItfModel):
       'title': self.name
     }
 
-  def info_dict(self):
+  def info_dict(self, request=None):
     return {
       'id': self.id,
       'letter': self.letter,