mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 11:49:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

(cp 4f07c75b8) fixes #2247 load child nodes and open the node

Browse source 
...before adding a new one
This commit is contained in:
Linty 2024-10-24 15:22:15 +02:00
parent 8f04d24a1d
commit b38aad5b7b
1 changed files with 39 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

51
admin/themes/default/js/albums.js
View file

@ -25,18 +25,7 @@ $(document).ready(() => {
var node = $('.tree').tree('getNodeById', node_id); var node = $('.tree').tree('getNodeById', node_id);
if (node.load_on_demand && node.haveChildren) { if (node.load_on_demand && node.haveChildren) {
const children = node.haveChildren; loadOnDemand(node);
const formatedChild = children.map((a) => {
const al = {...a, children:[]};
if (a.children) {
al.load_on_demand = true;
al.haveChildren = a.children;
}
return al;
});
$('.tree').tree('loadData', formatedChild, node);
node.load_on_demand = false;
} }
if (node) { if (node) {
@ -245,6 +234,10 @@ $(document).ready(() => {
success: function (raw_data) { success: function (raw_data) {
data = jQuery.parseJSON(raw_data); data = jQuery.parseJSON(raw_data);
var parent_node = $('.tree').tree('getNodeById', newAlbumParent); var parent_node = $('.tree').tree('getNodeById', newAlbumParent);
if (parent_node.load_on_demand && parent_node.haveChildren) {
loadOnDemand(parent_node);
}
if (parent_node) openNodeOnDemand(parent_node);
if (data.stat == "ok") { if (data.stat == "ok") {
if (newAlbumPosition == "last") { if (newAlbumPosition == "last") {
@ -879,3 +872,37 @@ function findAlbumById(a, id) {
} }
return null; return null;
} }
function loadOnDemand(node) {
const children = node.haveChildren;
const formatedChild = children.map((a) => {
const al = {...a, children:[]};
if (a.children) {
al.load_on_demand = true;
al.haveChildren = a.children;
}
return al;
});
$('.tree').tree('loadData', formatedChild, node);
node.load_on_demand = false;
}
function openNodeOnDemand(node) {
open_nodes = $('.tree').tree('getState').open_nodes;
if (!open_nodes.includes(node)) {
$('.tree').tree('openNode', node);
$(".move-cat-add").off("click").on("click", function (e) {
e.preventDefault();
openAddAlbumPopIn($(this).data("aid"));
$(".AddAlbumSubmit").data("a-parent", $(this).data("aid"));
});
$(".move-cat-delete").off('click').on("click", function () {
triggerDeleteAlbum($(this).data("id"));
});
$(".move-cat-title-container").off("click").on("click", function () {
openRenameAlbumPopIn($(this).find(".move-cat-title").attr("title"));
$(".RenameAlbumSubmit").data("cat_id", $(this).attr('data-id'));
});
}
}