fix compatibility with Django 1.1.1 (tested with debian lenny backport python-django...

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index fca89aa57e9f7694943c1d0e26baa606ea59fc79..f558e2da3b39b1a89af7247282b8a8f642277627 100644 (file)
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -174,7 +174,7 @@ class DurationField(models.Field):
     def get_prep_value(self, value):
         return self.to_python(value)
 
-    def get_db_prep_value(self, value, connection, prepared=False):
+    def get_db_prep_value(self, value, connection=None, prepared=False):
         # Casts times into the format expected by the backend
         return value.as_seconds()
 
@@ -332,12 +332,12 @@ class ModelCore(EnhancedModel):
                 required.append(field)
         return required
 
-    def save(self, force_insert=False, force_update=False, using=None):
+    def save(self, force_insert=False, force_update=False):
         required = self.required_fields()
         for field in required:
             if not getattr(self, field.name):
                 raise RequiredFieldError(self, field)
-        super(ModelCore, self).save(force_insert, force_update, using)
+        super(ModelCore, self).save(force_insert, force_update)
 
     @classmethod
     def get_dom_name(cls):

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 5479c2b805975284da27bb1b1425a9dc9291216d..2e28493b5f6cb3984b9f2d8076ecff66e1e1da47 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -54,9 +54,9 @@ class MediaResource(ModelCore):
         return _('Private data')
     public_access_label.verbose_name = _('public access')
 
-    def save_with_revision(self, user, force_insert=False, force_update=False, using=None):
+    def save_with_revision(self, user, force_insert=False, force_update=False):
         "Save a media object and add a revision"
-        self.save(force_insert, force_update, using)
+        self.save(force_insert, force_update)
         Revision.touch(self, user)    
 
     def get_revision(self):
@@ -192,12 +192,12 @@ class MediaCollection(MediaResource):
 
         return False
 
-    def save(self, force_insert=False, force_update=False, using=None):
+    def save(self, force_insert=False, force_update=False):
         if not self.code:
             raise RequiredFieldError(self, self._meta.get_field('code'))
         if not self.is_valid_code(self.code):
             raise MediaInvalidCodeError("%s is not a valid code for this collection" % self.code)
-        super(MediaCollection, self).save(force_insert, force_update, using)
+        super(MediaCollection, self).save(force_insert, force_update)
 
     class Meta(MetaCore):
         db_table = 'media_collections'
@@ -273,13 +273,13 @@ class MediaItem(MediaResource):
 
         return False
 
-    def save(self, force_insert=False, force_update=False, using=None):
+    def save(self, force_insert=False, force_update=False):
         if not self.code:
             raise RequiredFieldError(self, self._meta.get_field('code'))
         if not self.is_valid_code(self.code):
             raise MediaInvalidCodeError("%s is not a valid item code for collection %s" 
                                         % (self.code, self.collection.code))
-        super(MediaItem, self).save(force_insert, force_update, using)
+        super(MediaItem, self).save(force_insert, force_update)
 
     def computed_duration(self):
         "Tell the length in seconds of this item media data"

diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
index 605260432a8ba8d268d752f104e77c16283521c3..67a1570ba19bb671919811172b25196a22b68bb0 100644 (file)
--- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
@@ -34,7 +34,7 @@
     <td>
     {% if item.recorded_from_date %}
         {{ item.recorded_from_date.year }}
-        {% if item.recorded_to_date and item.recorded_to_date.year != item.recorded_from_date.year %}
+        {% if item.recorded_to_date and not item.recorded_to_date.year|equals:item.recorded_from_date.year %}
             - {{ item.recorded_to_date.year }}
         {% endif %}
     {% endif %}

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index bf9e7c06acb35dbfc33796fcacd9404fd3644345..dfc8ce317413be7758f00e6ee05c7391744ff8c9 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -205,3 +205,7 @@ def split(value, sep=','):
 @register.simple_tag
 def variable_link(object, url_name, url_key):
     return reverse(url_name, args=[field_value(object, url_key)])
+
+@register.filter
+def equals(value1, value2):
+    return value1 == value2