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

Compare commits

base: 0x2620:3f0e08a14241ae553a835cb323e410f2b6404788
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:34d1285e4b0fbae4e43b0692c9b39c61ec39cf51
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "3f0e08a14241ae553a835cb323e410f2b6404788" and "34d1285e4b0fbae4e43b0692c9b39c61ec39cf51" have entirely different histories.
3f0e08a142 ... 34d1285e4b

3 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pandora/taskqueue/models.py
View file

@ -88,9 +88,6 @@ class Task(models.Model):
except Item.DoesNotExist: except Item.DoesNotExist:
return False return False
if self.status == 'transcribing':
return False
if self.item.files.filter(wanted=True, available=False).count(): if self.item.files.filter(wanted=True, available=False).count():
status = 'pending' status = 'pending'
elif self.item.files.filter(uploading=True).count(): elif self.item.files.filter(uploading=True).count():

16
static/js/editor.js
View file

@ -481,16 +481,12 @@ pandora.ui.editor = function(data) {
pandora._dontSelectResult = false; pandora._dontSelectResult = false;
function confirmDeleteDialog(options, callback) { function confirmDeleteDialog(options, callback) {
const title = Ox.getObjectById( const subject = options.items.length == 1 ? Ox._('annotation') : Ox._('annotations')
pandora.site.layers,
getAnnotationById(options.items[0]).layer
).item
const subject = options.items.length == 1 ? title : title + 's'
const $dialog = pandora.ui.iconDialog({ const $dialog = pandora.ui.iconDialog({
buttons: [ buttons: [
Ox.Button({ Ox.Button({
id: 'cancel', id: 'cancel',
title: Ox._('Keep {0}', [Ox._(subject)]) title: Ox._('Cancel')
}) })
.bindEvent({ .bindEvent({
click: function() { click: function() {
@ -499,7 +495,7 @@ pandora.ui.editor = function(data) {
}), }),
Ox.Button({ Ox.Button({
id: 'delete', id: 'delete',
title: Ox._('Delete {0}', [Ox._(subject)]) title: Ox._('Delete')
}) })
.bindEvent({ .bindEvent({
click: function() { click: function() {
@ -509,13 +505,13 @@ pandora.ui.editor = function(data) {
}) })
], ],
content: Ox._( content: Ox._(
'Are you sure you want delete {0} {1}?<br><br>All data will be removed.', 'Are you sure you want delete {0} {1}',
[options.items.length, Ox._(subject.toLowerCase())] [options.items.length, subject]
), ),
height: 96, height: 96,
keys: {enter: 'delete', escape: 'cancel'}, keys: {enter: 'delete', escape: 'cancel'},
title: Ox._( title: Ox._(
'Delete {0}', [Ox._(subject)] 'Delete {0} {1}', [options.items.length, subject]
) )
}); });
$dialog.open() $dialog.open()

5
static/js/item.js
View file

@ -202,11 +202,6 @@ pandora.ui.item = function() {
} }
}); });
} }
// avoid loop while selecting multiple annotations
if (options.selected == '' && Ox.isArray(pandora.$ui[pandora.user.ui.itemView].options('selected'))) {
delete options.selected
}
console.log("!! video points update", pandora.user.ui.itemView, options)
pandora.$ui[pandora.user.ui.itemView].options(options); pandora.$ui[pandora.user.ui.itemView].options(options);
} }
} }