archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug #466 fixed, new album listed when moving photos

Browse source 
In the batch manager, merge action blocks "associate" and "move" because they
follow the same pattern (list of albums + create new).
This commit is contained in:
plegall 2016-05-02 16:09:50 +02:00
parent 89e0eed10a
commit d1cb1f86a8
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/batch_manager_global.php
View file

@ -44,7 +44,6 @@ trigger_notify('loc_begin_element_set_global');
check_input_parameter('del_tags', $_POST, true, PATTERN_ID);
check_input_parameter('associate', $_POST, false, PATTERN_ID);
check_input_parameter('move', $_POST, false, PATTERN_ID);
check_input_parameter('dissociate', $_POST, false, PATTERN_ID);
// +-----------------------------------------------------------------------+
@ -173,7 +172,7 @@ DELETE
else if ('move' == $action)
{
move_images_to_categories($collection, array($_POST['move']));
move_images_to_categories($collection, array($_POST['associate']));
$_SESSION['page_infos'] = array(
l10n('Information data registered in database')
@ -187,7 +186,7 @@ DELETE
else if ('no_virtual_album' == $page['prefilter'])
{
$category_info = get_cat_info($_POST['move']);
$category_info = get_cat_info($_POST['associate']);
if (empty($category_info['dir']))
{
$redirect = true;

18
admin/themes/default/template/batch_manager_global.tpl
View file

@ -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}
<p><label><input type="checkbox" name="confirm_deletion" value="1"> {'Are you sure?'|@translate}</label></p>
</div>
<!-- associate -->
<!-- associate -->{* also used for "move" action *}
<div id="action_associate" class="bulkAction">
<select data-selectize="categories" data-default="first" name="associate" style="width:600px"></select>
<br>{'... or '|@translate}
<a href="#" data-add-album="associate" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
</div>
<!-- move -->
<div id="action_move" class="bulkAction">
<select data-selectize="categories" data-default="first" name="move" style="width:600px"></select>
<br>{'... or '|@translate}
<a href="#" data-add-album="move" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
</div>
<!-- dissociate -->
<div id="action_dissociate" class="bulkAction">
<select data-selectize="categories" placeholder="{'Type in a search term'|translate}"