diff --git a/pandora/taskqueue/models.py b/pandora/taskqueue/models.py
index 1d114a2c..0d03f920 100644
--- a/pandora/taskqueue/models.py
+++ b/pandora/taskqueue/models.py
@@ -88,6 +88,9 @@ class Task(models.Model):
except Item.DoesNotExist:
return False
+ if self.status == 'transcribing':
+ return False
+
if self.item.files.filter(wanted=True, available=False).count():
status = 'pending'
elif self.item.files.filter(uploading=True).count():
diff --git a/static/js/editor.js b/static/js/editor.js
index 82a75344..70cc2e3e 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -481,12 +481,16 @@ pandora.ui.editor = function(data) {
pandora._dontSelectResult = false;
function confirmDeleteDialog(options, callback) {
- const subject = options.items.length == 1 ? Ox._('annotation') : Ox._('annotations')
+ const title = Ox.getObjectById(
+ pandora.site.layers,
+ getAnnotationById(options.items[0]).layer
+ ).item
+ const subject = options.items.length == 1 ? title : title + 's'
const $dialog = pandora.ui.iconDialog({
buttons: [
Ox.Button({
id: 'cancel',
- title: Ox._('Cancel')
+ title: Ox._('Keep {0}', [Ox._(subject)])
})
.bindEvent({
click: function() {
@@ -495,7 +499,7 @@ pandora.ui.editor = function(data) {
}),
Ox.Button({
id: 'delete',
- title: Ox._('Delete')
+ title: Ox._('Delete {0}', [Ox._(subject)])
})
.bindEvent({
click: function() {
@@ -505,13 +509,13 @@ pandora.ui.editor = function(data) {
})
],
content: Ox._(
- 'Are you sure you want delete {0} {1}',
- [options.items.length, subject]
+ 'Are you sure you want delete {0} {1}?
All data will be removed.',
+ [options.items.length, Ox._(subject.toLowerCase())]
),
height: 96,
keys: {enter: 'delete', escape: 'cancel'},
title: Ox._(
- 'Delete {0} {1}', [options.items.length, subject]
+ 'Delete {0}', [Ox._(subject)]
)
});
$dialog.open()
diff --git a/static/js/item.js b/static/js/item.js
index 79d0899c..18ccd28c 100644
--- a/static/js/item.js
+++ b/static/js/item.js
@@ -202,6 +202,11 @@ 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);
}
}