From d1cb1f86a8513f0f5690d4d61d3e52ffe9dbbf21 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 2 May 2016 16:09:50 +0200 Subject: bug #466 fixed, new album listed when moving photos In the batch manager, merge action blocks "associate" and "move" because they follow the same pattern (list of albums + create new). --- admin/themes/default/template/batch_manager_global.tpl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'admin/themes') diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index c3be514b4..d8b183717 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -134,7 +134,13 @@ $(document).ready(function() { $("select[name=selectAction]").change(function () { $("[id^=action_]").hide(); - $("#action_"+$(this).prop("value")).show(); + + var action = $(this).prop("value"); + if (action == 'move') { + action = 'associate'; + } + + $("#action_"+action).show(); if ($(this).val() != -1) { $("#applyActionBlock").show(); @@ -590,21 +596,13 @@ UL.thumbnails SPAN.wrap2 {ldelim}

- + {* also used for "move" action *}

{'... or '|@translate} {'create a new album'|@translate}
- -
- -
{'... or '|@translate} - {'create a new album'|@translate} -
- -