Changeset d24c827


Ignore:
Timestamp:
02/05/2012 16:31:23 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, server, storage, telecaster
Children:
7d6cfb3
Parents:
d68b189 (diff), 03ca023 (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:31:23)
git-committer:
yomguy <yomguy@…> (02/05/2012 16:31:23)
Message:

Merge branch 'master' into develop

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r20ef7d8 r03ca023  
    349349    creator_reference     = CharField(_('reference')) 
    350350    original_format       = ForeignKey(Format, related_name="item", 
    351                                        verbose_name=_('orinal format'), blank=True, 
     351                                       verbose_name=_('original format'), blank=True, 
    352352                                        null=True, on_delete=models.SET_NULL) 
    353353    external_references   = TextField(_('published references')) 
  • telemeta/views/base.py

    r42d8c45 r03ca023  
    660660            last_revision = None 
    661661 
    662         physical_format = item.format.physical_format 
     662        physical_format = item.original_format.original_format 
    663663 
    664664        return render(request, template, 
  • tools/dev/push.sh

    rcd6363d rd68b189  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull origin develop; \ 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull; \ 
    2626                        cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    2727                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
Note: See TracChangeset for help on using the changeset viewer.