Changeset 3b50bb3

Timestamp:

04/03/12 12:39:31 (15 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

355a16a

Parents:

f0e208a (diff), 2592b8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (04/03/12 12:39:31)

git-committer:

yomguy <yomguy@…> (04/03/12 12:39:31)

Message:

Merge branch 'master' into security

Conflicts:

telemeta/models/system.py

Location:

telemeta

Files:

• migrations/0001_initial.py (modified) (4 diffs)
• models/core.py (modified) (1 diff)
• models/system.py (modified) (1 diff)
• admin.py (modified) (1 diff)
• middleware.py (added)
• migrations/0009_auto__add_field_userprofile_last_session_key.py (added)
• templates/telemeta/inc/collection_related.html (modified) (1 diff)

telemeta/migrations/0001_initial.py

@@ -295 +295 @@
             ('code', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)),
             ('old_code', self.gf('telemeta.models.core.CharField')(default=None, max_length=250, null=True, blank=True)),
-            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)),
+            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)),
             ('physical_items_num', self.gf('telemeta.models.core.IntegerField')(default=0, blank=True)),
             ('physical_format', self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='collections', null=True, blank=True, to=orm['telemeta.PhysicalFormat'])),
@@ -349 +349 @@
             ('public_access', self.gf('telemeta.models.core.CharField')(default='metadata', max_length=16, blank=True)),
             ('file', self.gf('telemeta.models.core.FileField')(default='', max_length=100, db_column='filename', blank=True)),
-            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)),
+            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)),
         ))
         db.send_create_signal('telemeta', ['MediaItem'])
@@ -753 +753 @@
             'alt_ids': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
             'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
-            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}),
+            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}),
             'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
             'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}),
@@ -818 +818 @@
             'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"},
             'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
-            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}),
+            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}),
             'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}),
             'code': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '250', 'blank': 'True'}),

telemeta/models/core.py

@@ -152 +152 @@
 
     def __init__(self, *args, **kwargs):
-        super(DurationField, self).__init__(*args, **normalize_field(kwargs, '00:00'))
+        super(DurationField, self).__init__(*args, **normalize_field(kwargs, '0'))
 
     def db_type(self):

telemeta/models/system.py

@@ -90 +90 @@
     expiration_date = DateField(_('Expiration_date'))
     last_session_key = CharField(blank=True, null=True, max_length=40)
-    init_password   = BooleanField(_('Password initialization'))
 
     class Meta(MetaCore):

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+<<<<<<< HEAD
+from django.forms import CheckboxSelectMultiple
+=======
+>>>>>>> master
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin

telemeta/templates/telemeta/inc/collection_related.html

@@ -78 +78 @@
                                  {% endif %}
                                 {% endif %}
-                                {% endif %}
+                              {% endif %}
                             </td>
                         </tr>