diff --git a/pandora/taskqueue/models.py b/pandora/taskqueue/models.py index 0d03f920..1d114a2c 100644 --- a/pandora/taskqueue/models.py +++ b/pandora/taskqueue/models.py @@ -88,9 +88,6 @@ 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 70cc2e3e..82a75344 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -481,16 +481,12 @@ pandora.ui.editor = function(data) { pandora._dontSelectResult = false; function confirmDeleteDialog(options, callback) { - const title = Ox.getObjectById( - pandora.site.layers, - getAnnotationById(options.items[0]).layer - ).item - const subject = options.items.length == 1 ? title : title + 's' + const subject = options.items.length == 1 ? Ox._('annotation') : Ox._('annotations') const $dialog = pandora.ui.iconDialog({ buttons: [ Ox.Button({ id: 'cancel', - title: Ox._('Keep {0}', [Ox._(subject)]) + title: Ox._('Cancel') }) .bindEvent({ click: function() { @@ -499,7 +495,7 @@ pandora.ui.editor = function(data) { }), Ox.Button({ id: 'delete', - title: Ox._('Delete {0}', [Ox._(subject)]) + title: Ox._('Delete') }) .bindEvent({ click: function() { @@ -509,13 +505,13 @@ pandora.ui.editor = function(data) { }) ], content: Ox._( - 'Are you sure you want delete {0} {1}?

All data will be removed.', - [options.items.length, Ox._(subject.toLowerCase())] + 'Are you sure you want delete {0} {1}', + [options.items.length, subject] ), height: 96, keys: {enter: 'delete', escape: 'cancel'}, title: Ox._( - 'Delete {0}', [Ox._(subject)] + 'Delete {0} {1}', [options.items.length, subject] ) }); $dialog.open() diff --git a/static/js/item.js b/static/js/item.js index 18ccd28c..79d0899c 100644 --- a/static/js/item.js +++ b/static/js/item.js @@ -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); } }