Changeset 3b50bb3


Ignore:
Timestamp:
Apr 3, 2012 12:39:31 PM (3 years 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@…> (03/04/2012 12:39:31)
git-committer:
yomguy <yomguy@…> (03/04/2012 12:39:31)
Message:

Merge branch 'master' into security

Conflicts:

telemeta/models/system.py

Location:
telemeta
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • telemeta/migrations/0001_initial.py

    rb00cd59 r3511758  
    295295            ('code', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)), 
    296296            ('old_code', self.gf('telemeta.models.core.CharField')(default=None, max_length=250, null=True, blank=True)), 
    297             ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)), 
     297            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)), 
    298298            ('physical_items_num', self.gf('telemeta.models.core.IntegerField')(default=0, blank=True)), 
    299299            ('physical_format', self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='collections', null=True, blank=True, to=orm['telemeta.PhysicalFormat'])), 
     
    349349            ('public_access', self.gf('telemeta.models.core.CharField')(default='metadata', max_length=16, blank=True)), 
    350350            ('file', self.gf('telemeta.models.core.FileField')(default='', max_length=100, db_column='filename', blank=True)), 
    351             ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)), 
     351            ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)), 
    352352        )) 
    353353        db.send_create_signal('telemeta', ['MediaItem']) 
     
    753753            'alt_ids': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 
    754754            'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 
    755             'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}), 
     755            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), 
    756756            'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 
    757757            'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), 
     
    818818            'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"}, 
    819819            'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 
    820             'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}), 
     820            'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), 
    821821            'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 
    822822            'code': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '250', 'blank': 'True'}), 
  • telemeta/models/core.py

    re73a27f r3511758  
    152152 
    153153    def __init__(self, *args, **kwargs): 
    154         super(DurationField, self).__init__(*args, **normalize_field(kwargs, '00:00')) 
     154        super(DurationField, self).__init__(*args, **normalize_field(kwargs, '0')) 
    155155 
    156156    def db_type(self): 
  • telemeta/models/system.py

    rf83d820 r3b50bb3  
    9090    expiration_date = DateField(_('Expiration_date')) 
    9191    last_session_key = CharField(blank=True, null=True, max_length=40) 
    92     init_password   = BooleanField(_('Password initialization')) 
    9392 
    9493    class Meta(MetaCore): 
  • telemeta/admin.py

    rbfa68c2 rf83d820  
    66from telemeta.models.system import * 
    77from django.contrib import admin 
     8<<<<<<< HEAD 
     9from django.forms import CheckboxSelectMultiple 
     10======= 
     11>>>>>>> master 
    812from django.contrib.auth.models import User 
    913from django.contrib.auth.admin import UserAdmin 
  • telemeta/templates/telemeta/inc/collection_related.html

    r28fa06b r5a09eb7  
    7878                                 {% endif %} 
    7979                                {% endif %} 
    80                                 {% endif %} 
     80                              {% endif %} 
    8181                            </td> 
    8282                        </tr> 
Note: See TracChangeset for help on using the changeset viewer.