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

Compare commits

base: 0x2620:cabcbeb35d95630e01acca1cef68998a8271d51f
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:0ba80ada1f90204d56e159eb8313e4f386267ddf
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "cabcbeb35d95630e01acca1cef68998a8271d51f" and "0ba80ada1f90204d56e159eb8313e4f386267ddf" have entirely different histories.
cabcbeb35d ... 0ba80ada1f

2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/edit/models.py
View file

@ -94,8 +94,6 @@ class Edit(models.Model):
# dont add clip if in/out are invalid # dont add clip if in/out are invalid
if not c.annotation: if not c.annotation:
duration = c.item.sort.duration duration = c.item.sort.duration
if c.start is None or c.end is None:
return False
if c.start > c.end \ if c.start > c.end \
or round(c.start, 3) >= round(duration, 3) \ or round(c.start, 3) >= round(duration, 3) \
or round(c.end, 3) > round(duration, 3): or round(c.end, 3) > round(duration, 3):

4
static/js/folderList.js
View file

@ -478,9 +478,7 @@ pandora.ui.folderList = function(id, section) {
}, },
range: [0, 1] range: [0, 1]
}, function(result) { }, function(result) {
if(result.data.items && result.data.items.length) { that.value(item, 'items', result.data.items[0].items);
that.value(item, 'items', result.data.items[0].items);
}
callback(); callback();
}) })
}) })