diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js index eafabfcf64d2ef9eaea73303673e6b186e7ab184..58d538be7dfd130e9c953f05ff1d7f2145d3e1ac 100644 --- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js +++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js @@ -10,14 +10,13 @@ import("system.entities"); if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0) { - var selected = vars.get("$local.idvalues"); - var selectedFavos = []; + var seekedByCore = vars.get("$local.idvalues"); + var seekedByCoreFavos = []; - for(h = 0; h < selected.length; h++) - selectedFavos.push(buildFavoriteForDeletion(favorite.getFavorites(favorite.createGetFavoriteByIdConfig() - .setId(selected[h]))[0])); + var config = favorite.createGetFavoriteByIdConfig().setIds(seekedByCore); + seekedByCoreFavos = buildFavoritesForDeletion(favorite.getFavorites(config)); - result.object(selectedFavos); + result.object(seekedByCoreFavos); } else { @@ -32,12 +31,16 @@ else var finishedFavoritesForDisplay = []; var allContexts = getAllFavoriteEnabledContexts(); + var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig() + .setUserId(tools.getCurrentUser()[tools.NAME])); for(i = 0; i < allContexts.length; i++) { - var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig() - .setUserId(tools.getCurrentUser()[tools.NAME]) - .setObjectType(allContexts[i])); - var builtFavos = buildFavorites(allFavorites, allContexts[i]); + var contextFavorites = []; + for(x = 0; x < allFavorites.length; x++) + if(allFavorites[x]["objecttype"] === allContexts[i]) + contextFavorites.push(allFavorites[x]) + + var builtFavos = buildFavorites(contextFavorites, allContexts[i]); for(let x = 0; x < builtFavos.length; x++) { @@ -193,29 +196,36 @@ function getAllFavoriteEnabledContexts() return permittedContexts; } -function buildFavoriteForDeletion(favo) -{ - var groupid = favo["group"]["groupid"]; - var grouptitle = favo["group"]["grouptitle"]; - var grouptype = favo["group"]["grouptype"]; - var objecttype = favo["objecttype"]; - var image = ""; - var rowid = favo["rowid"]; - var title = ""; - var id = favo["id"]; - var user = favo["group"]["groupuser"]; - - return [ - groupid, - grouptitle, - grouptype, - objecttype, - image, - rowid, - title, - id, - user - ]; +function buildFavoritesForDeletion(favos) +{ + var results = []; + + for(i = 0; i < favos.length; i++) + { + var groupid = favos[i]["group"]["groupid"]; + var grouptitle = favos[i]["group"]["grouptitle"]; + var grouptype = favos[i]["group"]["grouptype"]; + var objecttype = favos[i]["objecttype"]; + var image = ""; + var rowid = favos[i]["rowid"]; + var title = ""; + var id = favos[i]["id"]; + var user = favos[i]["group"]["groupuser"]; + + results.push([ + groupid, + grouptitle, + grouptype, + objecttype, + image, + rowid, + title, + id, + user + ]); + } + + return results; } diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js index 5c5ab2b521e59ad3ba0e1b71bb5c99b51044fdf3..f289f5e98c0953ae46a6841387ca7cc912c1016c 100644 --- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js +++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js @@ -1,4 +1,5 @@ import("system.vars"); import("system.favorite"); -favorite.remove(favorite.createRemoveByIdConfig().setFavoriteRecordId(vars.get("$local.uid"))); \ No newline at end of file +var selected = vars.get("$sys.selection"); +favorite.remove(favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds(selected)); \ No newline at end of file