Ignore:
Timestamp:
Nov 28, 2011 11:09:06 AM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, prob, production, release/1.4.4, sabiod, search, security, server, social, storage, telecaster, test
Children:
4a62799
Parents:
18bfbcf (diff), e9ecf46 (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@…> (28/11/2011 11:09:06)
git-committer:
yomguy <yomguy@…> (28/11/2011 11:09:06)
Message:

Merge branch 'master' into crem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r71026ba r3471ccf  
    429429         
    430430    def to_dict(self): 
     431        if self.analyzer_id == 'duration': 
     432            value = self.value.split('.') 
     433            self.value = '.'.join([value[0], value[1][:2]]) 
    431434        return {'id': self.analyzer_id, 'name': self.name, 'value': self.value, 'unit': self.unit} 
    432435         
Note: See TracChangeset for help on using the changeset viewer.