forked from 0x2620/pandora
merge
This commit is contained in:
commit
89790f337d
3 changed files with 2 additions and 8 deletions
|
@ -9,7 +9,7 @@ import ox
|
||||||
import managers
|
import managers
|
||||||
|
|
||||||
class Log(models.Model):
|
class Log(models.Model):
|
||||||
created = models.DateTimeField(auto_now_add=True)
|
created = models.DateTimeField(auto_now_add=True, db_index=True)
|
||||||
modified = models.DateTimeField(auto_now=True)
|
modified = models.DateTimeField(auto_now=True)
|
||||||
user = models.ForeignKey(User, default=None, blank=True, null=True)
|
user = models.ForeignKey(User, default=None, blank=True, null=True)
|
||||||
url = models.CharField(max_length=1000, default='')
|
url = models.CharField(max_length=1000, default='')
|
||||||
|
|
|
@ -91,7 +91,7 @@ pandora.ui.clipList = function(videoRatio) {
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
init: function(data) {
|
init: function(data) {
|
||||||
// fixme: status needs an overhaul
|
// fixme: status needs an overhaul
|
||||||
if (!ui.item) {
|
if (!ui.item && pandora.$ui.total) {
|
||||||
pandora.$ui.total.html(pandora.ui.status('total', data));
|
pandora.$ui.total.html(pandora.ui.status('total', data));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -360,12 +360,6 @@ pandora.ui.item = function() {
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result.data) {
|
|
||||||
var director = result.data.director ? ' ('+result.data.director.join(', ') + ')' : '';
|
|
||||||
pandora.$ui.total.html(result.data.title + director);
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return that;
|
return that;
|
||||||
|
|
Loading…
Reference in a new issue