diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index 82fe120c..3bd3b748 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -56,7 +56,6 @@ "canExportAnnotations": {"member": true, "staff": true, "admin": true}, "canImportAnnotations": {"member": true, "staff": true, "admin": true}, "canImportItems": {"member": true, "staff": true, "admin": true}, - "canTranscribeAudio": {"staff": true, "admin": true}, "canManageDocuments": {"member": true, "staff": true, "admin": true}, "canManageEntities": {"member": true, "staff": true, "admin": true}, "canManageHome": {"staff": true, "admin": true}, diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index 5f08873f..51aaee24 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -63,7 +63,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "canExportAnnotations": {"member": true, "staff": true, "admin": true}, "canImportAnnotations": {"member": true, "staff": true, "admin": true}, "canImportItems": {"member": true, "staff": true, "admin": true}, - "canTranscribeAudio": {}, "canManageDocuments": {"member": true, "staff": true, "admin": true}, "canManageEntities": {"member": true, "staff": true, "admin": true}, "canManageHome": {"staff": true, "admin": true}, diff --git a/pandora/user/models.py b/pandora/user/models.py index 4234ab45..7f0a51a8 100644 --- a/pandora/user/models.py +++ b/pandora/user/models.py @@ -436,7 +436,8 @@ def has_capability(user, capability): level = 'guest' else: level = user.profile.get_level() - return settings.CONFIG['capabilities'].get(capability, {}).get(level) + return level in settings.CONFIG['capabilities'][capability] \ + and settings.CONFIG['capabilities'][capability][level] def merge_users(old, new): old.annotations.all().update(user=new) diff --git a/static/js/editor.js b/static/js/editor.js index 82a75344..19a9f99e 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -27,7 +27,6 @@ pandora.ui.editor = function(data) { enableDownload: pandora.hasCapability('canDownloadVideo') >= data.rightslevel || data.editable, enableExport: pandora.hasCapability('canExportAnnotations') || data.editable, enableImport: pandora.hasCapability('canImportAnnotations') || data.editable, - enableTranscribe: pandora.hasCapability('canTranscribeAudio') && data.editable, enableSetPosterFrame: !pandora.site.media.importFrames && data.editable, enableSubtitles: ui.videoSubtitles, find: ui.itemFind, @@ -433,42 +432,6 @@ pandora.ui.editor = function(data) { togglesize: function(data) { pandora.UI.set({videoSize: data.size}); }, - transcribeaudio: function() { - const $dialog = pandora.ui.iconDialog({ - buttons: [ - Ox.Button({ - id: 'cancel', - title: Ox._('Cancel') - }) - .bindEvent({ - click: function() { - $dialog.close(); - } - }), - Ox.Button({ - id: 'transcribe', - title: Ox._('Transcribe Audio') - }) - .bindEvent({ - click: function() { - $dialog.close(); - pandora.api.transcribeAudio({ - item: pandora.user.ui.item - }) - } - }) - ], - content: Ox._( - 'Are you sure you want to add automated transcription to "{0}"', - [data.title] - ), - keys: {enter: 'transcribe', escape: 'cancel'}, - title: Ox._( - 'Transcribe {0} {1}', [data.title] - ) - }); - $dialog.open() - }, pandora_showannotations: function(data) { that.options({showAnnotations: data.value}); },