0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

update mapview

Browse source
This commit is contained in:
rolux 2011-10-02 21:50:38 +00:00
parent a333e6b1b0
commit 18810602fb
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/clip/models.py
View file

@ -32,7 +32,7 @@ class Clip(models.Model):
hue = models.FloatField(default=0, db_index=True)
saturation = models.FloatField(default=0, db_index=True)
lightness = models.FloatField(default=0, db_index=True)
volume = models.FloatField(default=0, db_index=True)
volume = models.FloatField(default=0, null=True, db_index=True)
def update_calculated_values(self):
self.duration = self.end - self.start

10
static/js/pandora/ui/mapView.js
View file

@ -43,6 +43,7 @@ pandora.ui.mapView = function(videoRatio) {
var id = data.id || '';
updateToolbar(id ? data : null);
if (id && id[0] != '_') {
$status.html('loading...');
$list.options({
items: function(data, callback) {
var itemQuery;
@ -54,7 +55,7 @@ pandora.ui.mapView = function(videoRatio) {
operator: '&'
};
}
return pandora.api.findClips(Ox.extend({
return pandora.api.findAnnotations(Ox.extend({
itemQuery: itemQuery,
query: {
conditions: [{key: 'place', value: id, operator:'=='}],
@ -193,7 +194,10 @@ pandora.ui.mapView = function(videoRatio) {
}
function updateStatusbar(items) {
$status.html((items || 'No') + ' clip' + (items == 1 ? '' : 's'));
$status.html(
(items ? Ox.formatNumber(items) : 'No')
+ ' clip' + (items == 1 ? '' : 's')
);
}
function updateToolbar(place) {
@ -221,4 +225,4 @@ pandora.ui.mapView = function(videoRatio) {
return that;
};
};