Changeset 7566b3e


Ignore:
Timestamp:
May 2, 2012 4:33:41 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
security
Parents:
01772af (diff), 57305a5 (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@…> (02/05/2012 16:33:41)
git-committer:
yomguy <yomguy@…> (02/05/2012 16:33:41)
Message:

Merge branch 'master' into security

Location:
telemeta
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/format.py

    rc8cdfbe r57305a5  
    8383 
    8484    def __unicode__(self): 
    85         return self.original_code 
     85        return self.original_format 
    8686 
    8787    @property 
  • telemeta/views/base.py

    r03ca023 r57305a5  
    660660            last_revision = None 
    661661 
    662         physical_format = item.original_format.original_format 
     662        physical_format = item.original_format 
    663663 
    664664        return render(request, template, 
  • 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/models/system.py

    rfad4d14 r0f7c20f  
    4242import django.db.models as models 
    4343from django.forms import ModelForm 
     44from django.contrib.sessions.models import Session 
    4445 
    4546 
     
    9091    telephone       = CharField(_('Telephone')) 
    9192    expiration_date = DateField(_('Expiration_date')) 
     93    last_session_key = CharField(blank=True, null=True, max_length=40) 
    9294 
    9395    class Meta(MetaCore): 
  • 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.