Changeset 96ab603

Timestamp:

02/11/10 14:35:05 (3 years ago)

Author:

olivier <>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

5bf08b0

Parents:

12d665f

git-author:

olivier <> (02/11/10 14:35:05)

git-committer:

olivier <> (02/11/10 14:35:05)

Message:

fix compatibility with Django 1.1.1 (tested with debian lenny backport python-django 1.1.1-1~bpo50+1)

Location:

telemeta

Files:

• models/core.py (modified) (2 diffs)
• models/media.py (modified) (4 diffs)
• templates/telemeta_default/inc/mediaitem_list.html (modified) (1 diff)
• templatetags/telemeta_utils.py (modified) (1 diff)

telemeta/models/core.py

@@ -175 +175 @@
         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()
@@ -333 +333 @@
         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

telemeta/models/media.py

@@ -55 +55 @@
     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)    
 
@@ -193 +193 @@
         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):
@@ -274 +274 @@
         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'))
@@ -280 +280 @@
             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):

telemeta/templates/telemeta_default/inc/mediaitem_list.html

@@ -35 +35 @@
     {% 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 %}

telemeta/templatetags/telemeta_utils.py

@@ -206 +206 @@
 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