From 1c0462393c19eb66828a6a5082fed1a9b019f09e Mon Sep 17 00:00:00 2001 From: j Date: Fri, 11 Sep 2020 14:07:08 +0200 Subject: [PATCH] add to current item --- static/js/addFilesDialog.js | 34 +++++++++++++--------------------- static/js/addItemDialog.js | 14 ++++++++++---- static/js/mediaExistsDialog.js | 14 ++++++++++---- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/static/js/addFilesDialog.js b/static/js/addFilesDialog.js index 2a4e023c..0f75c07e 100644 --- a/static/js/addFilesDialog.js +++ b/static/js/addFilesDialog.js @@ -106,7 +106,7 @@ pandora.ui.addFilesDialog = function(options) { }); var selectItems = []; - if (!pandora.site.itemRequiresVideo && pandora.user.ui.item) { + if (pandora.user.ui.item && options.editable) { selectItems.push({ id: 'add', title: Ox._( @@ -114,31 +114,23 @@ pandora.ui.addFilesDialog = function(options) { [pandora.site.itemName.singular.toLowerCase()] ) }); + } + if (options.items.length > 1) { selectItems.push({ - id: 'one', + id: 'multiple', title: Ox._( - options.items.length > 1 ? 'Create new {0} with multiple parts' : 'Create new {0}', - [pandora.site.itemName.singular.toLowerCase()] - ) - }); - } else { - if (options.items.length > 1) { - selectItems.push({ - id: 'multiple', - title: Ox._( - 'Create multiple {0}', - [pandora.site.itemName.plural.toLowerCase()] - ) - }); - } - selectItems.push({ - id: 'one', - title: Ox._( - 'Create one {0} with multiple parts', - [pandora.site.itemName.singular.toLowerCase()] + 'Create multiple {0}', + [pandora.site.itemName.plural.toLowerCase()] ) }); } + selectItems.push({ + id: 'one', + title: Ox._( + options.items.length > 1 ? 'Create new {0} with multiple parts' : 'Create new {0}', + [pandora.site.itemName.singular.toLowerCase()] + ) + }); var $select = Ox.Select({ items: selectItems, width: 256 diff --git a/static/js/addItemDialog.js b/static/js/addItemDialog.js index d41a9ed3..ab1213f2 100644 --- a/static/js/addItemDialog.js +++ b/static/js/addItemDialog.js @@ -270,10 +270,16 @@ pandora.ui.addItemDialog = function(options) { } else { $screen.stop(); that.close(); - pandora.ui.addFilesDialog({ - action: selected, - items: items - }).open(); + (pandora.user.ui.item ? pandora.api.get : Ox.noop)({ + id: pandora.user.ui.item, + keys: ['editable'] + }, function(result) { + pandora.ui.addFilesDialog({ + action: selected, + items: items, + editable: pandora.user.ui.item && result.data.editable + }).open(); + }) } }) } diff --git a/static/js/mediaExistsDialog.js b/static/js/mediaExistsDialog.js index a6bcad98..4388b652 100644 --- a/static/js/mediaExistsDialog.js +++ b/static/js/mediaExistsDialog.js @@ -58,10 +58,16 @@ pandora.ui.mediaExistsDialog = function(options) { return existing.indexOf(item.oshash) == -1; }); that.close(); - pandora.ui.addFilesDialog({ - action: options.action, - items: items - }).open(); + (pandora.user.ui.item ? pandora.api.get : Ox.noop)({ + id: pandora.user.ui.item, + keys: ['editable'] + }, function(result) { + pandora.ui.addFilesDialog({ + action: options.action, + items: items, + editable: pandora.user.ui.item && result.data.editable + }).open(); + }) } }) ];