Changeset d24c827

Timestamp:

05/02/12 16:31:23 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, release/1.4.4, storage

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@…> (05/02/12 16:31:23)

git-committer:

yomguy <yomguy@…> (05/02/12 16:31:23)

Message:

Merge branch 'master' into develop

Files:

• telemeta/models/media.py (modified) (1 diff)
• telemeta/views/base.py (modified) (1 diff)
• tools/dev/push.sh (modified) (1 diff)

telemeta/models/media.py

@@ -349 +349 @@
     creator_reference     = CharField(_('reference'))
     original_format       = ForeignKey(Format, related_name="item",
-                                       verbose_name=_('orinal format'), blank=True,
+                                       verbose_name=_('original format'), blank=True,
                                         null=True, on_delete=models.SET_NULL)
     external_references   = TextField(_('published references'))

telemeta/views/base.py

@@ -660 +660 @@
             last_revision = None
 
-        physical_format = item.format.physical_format
+        physical_format = item.original_format.original_format
 
         return render(request, template,

tools/dev/push.sh

@@ -22 +22 @@
 #echo "Update jimi.parisson.com:"
 echo "Update angus.parisson.com:"
-ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \
-                        cd /home/telemeta/telemeta-develop; git pull origin develop; \
+ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \
+                        cd /home/telemeta/telemeta-develop; git pull; \
                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;