diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index d69577d01..dd1baa197 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -499,7 +499,7 @@ SELECT
'STATS' => l10n('Visited %d times', $row['hit']),
'FILE' => l10n('%s', $row['file']),
'related_categories' => $related_categories,
- 'related_category_ids' => json_encode($related_category_ids,JSON_NUMERIC_CHECK),
+ 'related_category_ids' => json_encode($related_category_ids),
'U_JUMPTO' => (isset($url_img) and $user['level'] >= $media['image']['level']) ? $url_img : null,
'tag_selection' => $tag_selection,
'U_DOWNLOAD' => 'action.php?id='.$row['id'].'&part=e&pwg_token='.get_pwg_token().'&download',
diff --git a/admin/themes/default/css/components/album_selector.css b/admin/themes/default/css/components/album_selector.css
new file mode 100644
index 000000000..b2ed7960a
--- /dev/null
+++ b/admin/themes/default/css/components/album_selector.css
@@ -0,0 +1,283 @@
+#addLinkedAlbum {
+ display:none;
+}
+
+.linkedAlbumPopIn {
+ position: fixed;
+ z-index: 102;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: rgba(0,0,0,0.7);
+}
+
+.linkedAlbumPopInContainer {
+ display:flex;
+ position:absolute;
+ left:50%;
+ top: 50%;
+ transform:translate(-50%, -48%);
+ text-align:left;
+ padding:20px;
+ flex-direction:column;
+ border-radius:15px;
+ align-items:center;
+ width: 460px;
+ height: 400px;
+}
+
+.linkedAlbumPopInContainer.big {
+ height: 500px;
+}
+
+.ClosePopIn {
+ position: absolute;
+ right: -40px;
+ top: -40px;
+ font-size: 30px;
+ color: white;
+}
+
+.ClosePopIn:hover {
+ text-decoration: none;
+ cursor: pointer;
+}
+
+.linkedAlbumPopInContainer .AddIconContainer {
+ margin-top: 20px;
+}
+
+.linkedAlbumPopInContainer .AddIcon {
+ border-radius: 9999px;
+ padding: 10px;
+ font-size: 2em;
+}
+
+.linkedAlbumPopInContainer .AddIconTitle {
+ font-size: 1.4em;
+ font-weight: bold;
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 15px;
+}
+
+#linkedAlbumSearch .search-icon {
+ position: absolute;
+ transform: translate(7px, 8px);
+ font-size: 18px;
+ top: auto;
+}
+
+.search-cancel-linked-album {
+ opacity: 0.4;
+ cursor: pointer;
+ position: absolute;
+ font-size: 18px;
+ transform: translate(215px, 8px);
+}
+
+.search-cancel-linked-album:hover {
+ opacity: 1;
+}
+
+.linkedAlbumPopInContainer .searching {
+ margin-top: 10px;
+}
+
+.linkedAlbumPopInContainer #searchResult {
+ width: 100%;
+ overflow-y: auto;
+ max-height: 400px;
+ margin: 10px 0 0 0;
+}
+
+.put-to-root {
+ width: 220px;
+ margin-top: 5px;
+}
+.put-to-root p {
+ margin: 0 auto;
+}
+
+/* Prefill */
+.display-subcat {
+ margin-right: 2px;
+}
+
+.display-subcat:hover {
+ cursor: pointer;
+}
+
+.display-subcat::before {
+ transition: 0.5s;
+ transform: rotate(90deg);
+}
+
+.display-subcat.open::before {
+ transform: rotate(180deg);
+}
+
+.search-result-item {
+ margin: 10px 0px;
+ padding: 5px 10px;
+ height: 25px;
+ border-radius: 5px;
+ font-weight: bold;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+}
+
+.search-result-item .item-add {
+ margin-left: auto;
+ cursor: pointer;
+}
+
+.notClickable {
+ opacity: 0.3;
+ cursor: default;
+}
+
+.notClickable:hover {
+ cursor: default;
+}
+
+.search-result-item.already-in {
+ cursor: default;
+}
+
+.prefill-results-item {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+}
+
+.search-result-path {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 350px;
+ direction: rtl;
+ text-align: left;
+}
+
+.search-result-subcat-item {
+ display: none;
+}
+
+.and-more{
+ text-align: center;
+}
+
+/* Album selector View */
+.album-create {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ flex-direction: column;
+}
+
+.album-selector,
+.album-create {
+ text-align: center;
+}
+
+.linked-album-subtitle {
+ margin: 0 0 30px 0;
+}
+
+.linked-album-subtitle p {
+ margin: 0;
+ font-style: italic;
+ font-weight: 700;
+ color: #AAAAAA;
+}
+
+.linked-add-album {
+ display: none;
+ margin: 0px;
+}
+
+.album-switch-bottom {
+ width: 100%;
+ margin-top: auto;
+}
+
+.album-switch-container {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 5px;
+ align-items: center;
+ justify-content: space-between;
+ height: 40px;
+}
+
+.switch-input {
+ display: flex;
+ align-items: center;
+}
+
+.linked-album-input-container {
+ width: 100%;
+ text-align: start;
+}
+
+.linked-album-input-container.album-name {
+ margin-bottom: 20px;
+}
+
+.linked-album-input-container .user-property-input,
+.linked-add-radio-input {
+ margin-top: 10px;
+}
+
+.linked-add-radio-input {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-bottom: 10px;
+}
+
+.linked-add-radio-input input {
+ margin-right: 5px;
+}
+
+.linked-add-radio-input label {
+ font-size: 12px;
+ font-weight: 600;
+}
+
+.linked-album-create-btn {
+ display: flex;
+ margin-top: auto;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.linked-album-create-btn p {
+ margin: 0;
+ font-size: 15px;
+}
+
+.linked-button-cancel {
+ cursor: pointer;
+ font-weight: 700;
+}
+
+.linked-button-cancel:hover {
+ color: #000;
+}
+
+.AddAlbumErrors {
+ visibility: hidden;
+}
+
+#linkedAddAlbumErrors {
+ margin: 0;
+ text-align: start;
+ padding: 10px;
+}
\ No newline at end of file
diff --git a/admin/themes/default/js/album_selector.js b/admin/themes/default/js/album_selector.js
index 1d2fbb01c..b25b1ba36 100644
--- a/admin/themes/default/js/album_selector.js
+++ b/admin/themes/default/js/album_selector.js
@@ -1,95 +1,346 @@
-function set_up_popin() {
- $(".ClosePopIn").on('click', function () {
- linked_albums_close();
+/*-------
+Variables
+-------*/
+const addLinkedAlbum = $('#addLinkedAlbum');
+const closeAlbumPopIn = $('#closeAlbumPopIn');
+const searchInput = $('.search-input');
+const searchResult = $('#searchResult');
+const limitReached = $('.limitReached');
+const iconCancelInput = $(".search-cancel-linked-album");
+const relatedCategoriesDom = $('.related-categories-container .breadcrumb-item .remove-item');
+const iconSearchingSpin = $('.searching');
+const albumSelector = $('#linkedAlbumSelector');
+const albumCreate = $('#linkedAlbumCreate');
+const albumCheckBox = $('#album-create-check');
+const linkedAddAlbum = $('#linkedAddAlbum');
+const linkedModalTitle = $('#linkedModalTitle');
+const linkedAlbumSwitch = $('#linkedAlbumSwitch');
+const linkedAlbumSubTitle = $('#linkedAlbumSubtitle');
+const linkedAddNewAlbum = $('#linkedAddNewAlbum');
+const linkedAlbumInput = $('#linkedAlbumInput');
+const putToRoot = $('.put-to-root-container');
+const linkedAlbumCancel = $('#linkedAlbumCancel');
+const linkedAddAlbumErrors = $('#linkedAddAlbumErrors');
+const AddAlbumErrors = $('.AddAlbumErrors');
+
+let isAlbumCreationChecked = false;
+
+/*--------------------
+Document ready / event
+--------------------*/
+$(function() {
+ iconCancelInput.hide();
+ albumCreate.hide();
+
+ // event close pop in
+ closeAlbumPopIn.on('click', () => {
+ close_album_selector();
+ });
+
+ // event empty search input
+ if (iconCancelInput.length) {
+ iconCancelInput.on("click", function () {
+ searchInput.val("");
+ searchInput.trigger("input");
+ });
+ }
+
+ // event perform search
+ searchInput.on('input', function () {
+ if ($(this).val() != 0) {
+ iconCancelInput.show()
+ } else {
+ iconCancelInput.hide();
+ }
+
+ // Search input value length required to start searching
+ if ($(this).val().length > 0) {
+ perform_albums_search($(this).val());
+ } else {
+ limitReached.html(str_no_search_in_progress);
+ searchResult.empty();
+ prefill_search();
+ }
+ });
+
+ // event remove category
+ relatedCategoriesDom.on("click", function () {
+ const pictureId = $(this).parents("fieldset").data("image_id");
+ if (pictureId) {
+ remove_related_category($(this).attr("id"), pictureId);
+ } else {
+ remove_related_category($(this).attr("id"));
+ }
+ });
+
+ // in admin mode
+ if (in_admin_mode) {
+ // toggle view
+ albumCheckBox.on('change', function () {
+ isAlbumCreationChecked = $(this).is(':checked');
+ switch_album_creation();
+ });
+ }
+});
+
+/*--------------
+General function
+--------------*/
+function open_album_selector() {
+ if (in_admin_mode) {
+ hard_reset_album_selector();
+ } else {
+ reset_album_selector();
+ }
+ addLinkedAlbum.fadeIn();
+}
+
+function close_album_selector() {
+ addLinkedAlbum.fadeOut();
+}
+
+function reset_album_selector() {
+ prefill_search();
+ searchInput.val('');
+ searchInput.trigger("input").trigger('focus');
+ limitReached.html(str_no_search_in_progress);
+ albumSelector.show();
+}
+
+function switch_album_creation() {
+ reset_album_selector();
+
+ if (isAlbumCreationChecked) {
+ if (putToRoot.length) {
+ putToRoot.hide();
+ }
+ linkedModalTitle.hide();
+ linkedModalTitle.html(str_create_and_select);
+ linkedAddAlbum.fadeIn();
+ linkedModalTitle.fadeIn();
+
+ linkedAddAlbum.off('click').on('click', function() {
+ switch_album_view('root');
+ });
+ } else {
+ if (putToRoot.length) {
+ putToRoot.fadeIn();
+ }
+ linkedModalTitle.hide();
+ linkedModalTitle.html(str_album_modal_title);
+ linkedModalTitle.fadeIn();
+ linkedAddAlbum.fadeOut();
+ linkedAddAlbum.off('click');
+ }
+}
+
+function switch_album_view(cat) {
+ albumSelector.hide();
+ searchResult.hide();
+ linkedAlbumSwitch.hide();
+ albumCreate.fadeIn();
+
+ linkedAlbumSubTitle.html(sprintf(str_add_subcat_of, cat === 'root' ? str_root_album_select : cat.name));
+ linkedAddNewAlbum.off('click').on('click', function () {
+ add_new_album(cat === 'root' ? cat : cat.id);
+ });
+
+ linkedAlbumCancel.off('click').on('click', function () {
+ close_album_selector();
+ });
+
+ linkedAlbumInput.off('input').on('input', function () {
+ hide_new_album_error();
});
}
-function linked_albums_close() {
- $("#addLinkedAlbum").fadeOut();
-}
-
-function linked_albums_open(pictureId) {
- $("#addLinkedAlbum").fadeIn();
- if(null != pictureId)
- {
- console.log(pictureId);
- $("#addLinkedAlbum .linkedAlbumPopInContainer").attr("id",pictureId);
- }
- $(".search-input").val("");
- $(".search-input").focus();
- $("#searchResult").empty();
- $(".limitReached").html(str_no_search_in_progress);
-}
-
-function linked_albums_search(searchText, pictureId) {
-
- if (api_method == 'pwg.categories.getList') {
- api_params = {
- cat_id: 0,
- recursive: true,
- fullname: true,
- search: searchText,
- }
+function select_new_album_and_close(cat) {
+ if (typeof b_current_picture_id !== 'undefined') {
+ add_related_category(cat.id, cat.full_name_with_admin_links, b_current_picture_id);
} else {
- api_params = {
- search: searchText,
- additional_output: "full_name_with_admin_links",
- }
+ add_related_category(cat.id, cat.full_name_with_admin_links);
+ }
+
+ close_album_selector();
+ hard_reset_album_selector();
+}
+
+function hard_reset_album_selector() {
+ albumCreate.hide();
+ hide_new_album_error();
+
+ reset_album_selector();
+ linkedAlbumInput.val('');
+ if (albumCheckBox.is(':checked')) {
+ albumCheckBox.trigger('click');
+ }
+ searchResult.show();
+ linkedAlbumSwitch.show();
+}
+
+function hide_new_album_error() {
+ AddAlbumErrors.css('visibility', 'hidden');
+}
+
+function show_new_album_error(text) {
+ linkedAddAlbumErrors.html(text);
+ AddAlbumErrors.css('visibility', 'visible');
+}
+
+function prefill_results(rank, cats, limit) {
+ let display_div = $('#subcat-'+rank);
+ if ('root' == rank){
+ $("#searchResult").empty();
+ display_div = $('#searchResult');
+ } else {
+ display_div = $('#subcat-'+rank);
}
- $(".linkedAlbumPopInContainer .searching").show();
- $.ajax({
- url: "ws.php?format=json&method=" + api_method,
- type: "POST",
- dataType: "json",
- data : api_params,
- before: function () {
+ cats.forEach(cat => {
+ let subcat = '';
+ if (cat.nb_categories > 0) {
+ subcat = ""
+ }
+
+ const iconAlbum = isAlbumCreationChecked ? 'icon-add-album' : 'gallery-icon-plus-circled';
+
+ if (!related_categories_ids.includes(cat.id) || isAlbumCreationChecked) {
+ display_div.append(
+ "" +
+ subcat +
+ "
" +
+ "" + cat.name +"" +
+ "" +
+ "
" +
+ "
" +
+ subcat +
+ "
" +
+ "" + cat.name +"" +
+ "" +
+ "
" +
+ "
" + text + "
"
+ );
+ }
}
+function fill_results(cats) {
+ $("#searchResult").empty();
+ cats.forEach(cat => {
+ const cat_name = in_admin_mode ? cat.fullname : cat.name;
+ const iconAlbum = isAlbumCreationChecked ? 'icon-add-album' : 'gallery-icon-plus-circled';
+
+ $("#searchResult").append(
+ "" +
+ "" + cat_name + "" +
+ "
"
+ );
+
+ if (isAlbumCreationChecked) {
+ $(".search-result-item#"+ cat.id).off('click').on("click", function () {
+ switch_album_view(cat);
+ });
+ return
+ }
+
+ console.log(related_categories_ids)
+ if (related_categories_ids.includes(cat.id)) {
+ $(".search-result-item #"+ cat.id +".item-add").addClass("notClickable").attr("title", str_already_in_related_cats).off('click').on("click", function (event) {
+ event.preventDefault();
+ });
+ $("#"+cat.id+".search-result-item").addClass("notClickable").attr("title", str_already_in_related_cats).off('click').on("click", function (event) {
+ event.preventDefault();
+ });
+ } else {
+ $(".search-result-item#"+ cat.id).off('click').on("click", function () {
+ if (typeof b_current_picture_id !== 'undefined') {
+ add_related_category(cat.id, in_admin_mode ? cat.full_name_with_admin_links : cat.name, b_current_picture_id);
+ } else {
+ add_related_category(cat.id, in_admin_mode ? cat.full_name_with_admin_links : cat.name);
+ }
+ });
+ }
+ });
+}
+
+/*-----------
+Ajax function
+-----------*/
+
function prefill_search() {
$(".linkedAlbumPopInContainer .searching").show();
- if (api_method == "pwg.categories.getList") {
- api_params = {
- cat_id: 0,
- recursive: false,
- fullname: true,
- limit: limit_params,
- };
- } else {
- api_params = {
- additional_output: "full_name_with_admin_links",
- };
- }
+ let api_params = {
+ cat_id: 0,
+ recursive: false,
+ fullname: true,
+ limit: limit_params,
+ };
+
+ in_admin_mode && (api_params.additional_output = 'full_name_with_admin_links');
$.ajax({
- url: "ws.php?format=json&method=" + api_method,
+ url: "ws.php?format=json&method=" + methodPwg,
type: "POST",
dataType: "json",
data: api_params,
@@ -109,33 +360,122 @@ function prefill_search() {
}
async function prefill_search_subcats(cat_id) {
- let method = {};
- if (api_method == "pwg.categories.getList") {
- method = {
- cat_id: cat_id,
- recursive: false,
- limit: limit_params,
- };
- } else {
- method = {
- additional_output: "full_name_with_admin_links",
- };
- }
+ let api_params = {
+ cat_id: cat_id,
+ recursive: false,
+ limit: limit_params,
+ };
+
+ in_admin_mode && (api_params.additional_output = 'full_name_with_admin_links');
try {
const data = await $.ajax({
- url: "ws.php?format=json&method=" + api_method,
+ url: "ws.php?format=json&method=" + methodPwg,
type: "POST",
dataType: "json",
- data: method,
+ data: api_params,
});
// for debug
// console.log(data);
- const cats = data.result.categories.filter((c) => c.id !== +cat_id);
+ const cats = data.result.categories.filter((c) => c.id != cat_id);
const limit = data.result.limit;
prefill_results(cat_id, cats, limit);
} catch (e) {
console.log("error", e.message);
}
+}
+
+function perform_albums_search(searchText) {
+ let api_params = {
+ cat_id: 0,
+ recursive: true,
+ fullname: true,
+ search: searchText,
+ }
+
+ in_admin_mode && (api_params.additional_output = 'full_name_with_admin_links');
+
+ iconSearchingSpin.show();
+ $.ajax({
+ url: "ws.php?format=json&method=" + methodPwg,
+ type: "POST",
+ dataType: "json",
+ data : api_params,
+ before: function () {
+
+ },
+ success: function (raw_data) {
+ iconSearchingSpin.hide();
+ categories = raw_data.result.categories;
+ fill_results(categories);
+
+ if (raw_data.result.limit_reached) {
+ limitReached.html(str_result_limit.replace("%d", categories.length));
+ } else {
+ if (categories.length == 1) {
+ limitReached.html(str_album_found);
+ } else {
+ limitReached.html(str_albums_found.replace("%d", categories.length));
+ }
+ }
+ },
+ error: function (e) {
+ iconSearchingSpin.hide();
+ console.log(e.message);
+ }
+ })
+}
+
+function add_new_album(cat_id) {
+ const cat_name = linkedAlbumInput.val();
+ const cat_position = $("input[name=position]:checked").val();
+ const api_params = {
+ name: cat_name,
+ parent: cat_id === 'root' ? 0 : +cat_id,
+ position: cat_position,
+ }
+
+ if(!cat_name || '' === cat_name) {
+ show_new_album_error(str_complete_name_field);
+ return
+ }
+
+ $.ajax({
+ url: 'ws.php?format=json&method=pwg.categories.add',
+ type: 'POST',
+ dataType: 'json',
+ data: api_params,
+ success: function (data) {
+ if (data.stat === 'ok') {
+ get_album_by_id(data.result.id);
+ } else {
+ show_new_album_error(str_an_error_has_occured);
+ }
+ },
+ error: function () {
+ show_new_album_error(str_an_error_has_occured);
+ }
+ });
+}
+
+function get_album_by_id(cat_id) {
+ $.ajax({
+ url: 'ws.php?format=json&method=pwg.categories.getAdminList',
+ dataType: 'json',
+ data: {
+ cat_id,
+ additional_output: 'full_name_with_admin_links',
+ },
+ success: function(data) {
+ if(data.stat === 'ok') {
+ select_new_album_and_close(data.result.categories[0]);
+ } else {
+ show_new_album_error(str_an_error_has_occured);
+ }
+ },
+ error: function () {
+ show_new_album_error(str_an_error_has_occured);
+ }
+ });
}
\ No newline at end of file
diff --git a/admin/themes/default/js/batchManagerUnit.js b/admin/themes/default/js/batchManagerUnit.js
index 2ab2bec7c..e3ad3dcd9 100644
--- a/admin/themes/default/js/batchManagerUnit.js
+++ b/admin/themes/default/js/batchManagerUnit.js
@@ -161,101 +161,54 @@ $(document).ready(function() {
});
//Categories
$(".linked-albums.add-item").on("click", function() {
- var pictureId = $(this).parents("fieldset").data("image_id")
- linked_albums_open(pictureId);
- set_up_popin();
+ b_current_picture_id = $(this).parents("fieldset").data("image_id");
+ related_categories_ids = get_related_category(b_current_picture_id);
+ open_album_selector();
});
- $(".limitReached").html(str_no_search_in_progress);
- $(".search-cancel-linked-album").hide();
- $(".linkedAlbumPopInContainer .searching").hide();
- $("#linkedAlbumSearch .search-input").on('input', function() {
- var pictureId = $("#linkedAlbumSearch .search-input").parents(".linkedAlbumPopInContainer").attr("id");
- if ($(this).val() != 0) {
- $("#linkedAlbumSearch .search-cancel-linked-album").show()
- } else {
- $("#linkedAlbumSearch .search-cancel-linked-album").hide();
- }
- // Search input value length required to start searching
- if ($(this).val().length > 0) {
- linked_albums_search($(this).val(), pictureId);
- } else {
- $(".limitReached").html(str_no_search_in_progress);
- $("#searchResult").empty();
- }
- })
- $(".search-cancel-linked-album").on("click", function() {
- $("#linkedAlbumSearch .search-input").val("");
- $("#linkedAlbumSearch .search-input").trigger("input");
- })
- $(".related-categories-container .breadcrumb-item .remove-item").on("click", function() {
- var pictureId = $(this).parents("fieldset").data("image_id")
- remove_related_category($(this).attr("id"), pictureId);
- })
pluginFunctionMapInit(activePlugins);
})
-function fill_results(cats, pictureId) {
- $("#searchResult").empty();
- cats.forEach(cat => {
- $("#searchResult").append(
- "" +
- "" + cat.fullname + "" +
- "
"
- );
- var this_related_category_ids = window["related_category_ids_" + pictureId];
- var catId = parseInt(cat.id);
- if (this_related_category_ids.includes(catId)) {
- $(".search-result-item#" + catId + " .item-add").addClass("notClickable").attr("title", str_already_in_related_cats).on("click", function(event) {
- event.preventDefault();
- });
- $(".search-result-item").addClass("notClickable").attr("title", str_already_in_related_cats).on("click", function(event) {
- event.preventDefault();
- });
- } else {
- $(".search-result-item#" + catId + " .item-add").on("click", function() {
- add_related_category(catId, cat.full_name_with_admin_links, pictureId);
- });
- }
- });
+function get_related_category(pictureId) {
+ return all_related_categories_ids.find((c) => c.id == pictureId).cat_ids ?? [];
}
function remove_related_category(cat_id, pictureId) {
- var catId = parseInt(cat_id);
- var this_related_category_ids = window["related_category_ids_" + pictureId];
- $("#" + pictureId + " .invisible-related-categories-select option[value=" + catId + "]").remove();
+ $("#" + pictureId + " .invisible-related-categories-select option[value=" + +cat_id + "]").remove();
$("#" + pictureId + " .invisible-related-categories-select").trigger('change');
- $("#" + pictureId + " #" + catId).parent().remove();
- cat_to_remove_index = this_related_category_ids.indexOf(catId);
+ $("#" + pictureId + " #" + cat_id).parent().remove();
+
+ const cat_to_remove_index = all_related_categories_ids.findIndex((c) => c.id == pictureId);
if (cat_to_remove_index > -1) {
- this_related_category_ids.splice(cat_to_remove_index, 1);
+ all_related_categories_ids[cat_to_remove_index].cat_ids.splice(cat_to_remove_index, 1);
+ showUnsavedLocalBadge(pictureId);
}
check_related_categories(pictureId);
}
function add_related_category(cat_id, cat_link_path, pictureId) {
- var catId = parseInt(cat_id);
- var this_related_category_ids = window["related_category_ids_" + pictureId];
- if (!this_related_category_ids.includes(catId)) {
+ related_categories_ids = get_related_category(pictureId);
+ if (!related_categories_ids.includes(cat_id)) {
$("#" + pictureId + " .related-categories-container").append(
"" +
- "" + cat_link_path + "" +
+ "" + cat_link_path + "" +
"
"
);
- $(".search-result-item#" + catId).addClass("notClickable");
- this_related_category_ids.push(catId);
- $(".invisible-related-categories-select").append("").trigger('change');
- $("#" + catId).on("click", function() {
- remove_related_category(catId, pictureId);
+ $(".search-result-item#" + cat_id).addClass("notClickable");
+ related_categories_ids.push(cat_id);
+ showUnsavedLocalBadge(pictureId);
+ $(".invisible-related-categories-select").append("").trigger('change');
+ $("#" + cat_id).on("click", function() {
+ remove_related_category(cat_id, pictureId);
})
- linked_albums_close();
+ close_album_selector();
}
check_related_categories(pictureId);
}
function check_related_categories(pictureId) {
- var this_related_category_ids = window["related_category_ids_" + pictureId];
- $("#picture-" + pictureId + " .linked-albums-badge").html(this_related_category_ids.length);
- if (this_related_category_ids.length == 0) {
+ related_categories_ids = get_related_category(pictureId);
+ $("#picture-" + pictureId + " .linked-albums-badge").html(related_categories_ids.length);
+ if (related_categories_ids.length == 0) {
$("#" + pictureId + " .linked-albums-badge").addClass("badge-red");
$("#" + pictureId + " .add-item").addClass("highlight");
$("#" + pictureId + " .orphan-photo").html(str_orphan).show();
@@ -393,10 +346,7 @@ function saveChanges(pictureId) {
var comment = $("#description-" + pictureId).val();
var level = $("#level-" + pictureId + " option:selected").val();
// Get Categories
- var categories = [];
- $("#picture-" + pictureId + " .remove-item").each(function() {
- categories.push($(this).attr("id"));
- });
+ const categories = get_related_category(pictureId);
var categoriesStr = categories.join(';');
// Get Tags
var tags = [];
diff --git a/admin/themes/default/js/cat_modify.js b/admin/themes/default/js/cat_modify.js
index c160e7636..85cfe88cb 100644
--- a/admin/themes/default/js/cat_modify.js
+++ b/admin/themes/default/js/cat_modify.js
@@ -329,8 +329,7 @@ jQuery(document).ready(function() {
$("#cat-parent.icon-pencil").on("click", function (e) {
// Don't open the popin if you click on the album link
if (e.target.localName != 'a') {
- linked_albums_open();
- set_up_popin();
+ open_album_selector();
if (parent_album != 0) {
$(".put-to-root").removeClass("notClickable");
@@ -343,29 +342,6 @@ jQuery(document).ready(function() {
}
});
- $(".limitReached").html(str_no_search_in_progress);
- $(".search-cancel-linked-album").hide();
- $(".linkedAlbumPopInContainer .searching").hide();
- $("#linkedAlbumSearch .search-input").on('input', function () {
- if ($(this).val() != 0) {
- $("#linkedAlbumSearch .search-cancel-linked-album").show()
- } else {
- $("#linkedAlbumSearch .search-cancel-linked-album").hide();
- }
-
- if ($(this).val().length > 0) {
- linked_albums_search($(this).val());
- } else {
- $(".limitReached").html(str_no_search_in_progress);
- $("#searchResult").empty();
- }
- })
-
- $(".search-cancel-linked-album").on("click", function () {
- $("#linkedAlbumSearch .search-input").val("");
- $("#linkedAlbumSearch .search-input").trigger("input");
- })
-
$(".allow-comments").on("click", function () {
jQuery.ajax({
url: "ws.php?format=json&method=pwg.categories.setInfo",
@@ -497,42 +473,24 @@ function checkAlbumLock() {
// Parent album popin functions
-function fill_results(cats) {
- $("#searchResult").empty();
- cats.forEach(cat => {
- $("#searchResult").append(
- "" +
- "" + cat.fullname +"" +
- "
"
- );
-
- // If the searched albums are in the children of the current album they become unclickable
- // Same if the album is already selected
-
- if (parent_album == cat.id || cat.uppercats.split(',').includes(album_id+"")) {
- $(" #"+ cat.id +".search-result-item").addClass("notClickable").attr("title", str_already_in_related_cats).on("click", function (event) {
- event.preventDefault();
- });
- } else {
- $("#"+ cat.id + ".search-result-item ").on("click", function () {
- add_related_category(cat.id, cat.full_name_with_admin_links);
- });
- }
- });
-}
-
function add_related_category(cat_id, cat_link_path) {
if (parent_album != cat_id) {
+ const cat_to_remove_index = related_categories_ids.indexOf(parent_album.toString());
+ if (cat_to_remove_index > -1) {
+ related_categories_ids.splice(cat_to_remove_index, 1);
+ }
+
$("#cat-parent").html(
cat_link_path
);
$(".search-result-item #" + cat_id).addClass("notClickable");
parent_album = cat_id;
+ related_categories_ids.push(cat_id);
$(".invisible-related-categories-select").append("");
- linked_albums_close();
+ close_album_selector();
}
}
diff --git a/admin/themes/default/js/picture_modify.js b/admin/themes/default/js/picture_modify.js
index 386c0c253..d029e6606 100644
--- a/admin/themes/default/js/picture_modify.js
+++ b/admin/themes/default/js/picture_modify.js
@@ -1,37 +1,9 @@
$(document).ready(function () {
$(".linked-albums.add-item").on("click", function () {
- linked_albums_open();
- set_up_popin();
+ open_album_selector();
});
- $(".limitReached").html(str_no_search_in_progress);
- $(".search-cancel-linked-album").hide();
- $(".linkedAlbumPopInContainer .searching").hide();
- $("#linkedAlbumSearch .search-input").on('input', function () {
- if ($(this).val() != 0) {
- $("#linkedAlbumSearch .search-cancel-linked-album").show()
- } else {
- $("#linkedAlbumSearch .search-cancel-linked-album").hide();
- }
-
- // Search input value length required to start searching
- if ($(this).val().length > 0) {
- linked_albums_search($(this).val());
- } else {
- $(".limitReached").html(str_no_search_in_progress);
- $("#searchResult").empty();
- }
- })
-
- $(".search-cancel-linked-album").on("click", function () {
- $("#linkedAlbumSearch .search-input").val("");
- $("#linkedAlbumSearch .search-input").trigger("input");
- })
-
- $(".related-categories-container .breadcrumb-item .remove-item").on("click", function () {
- remove_related_category($(this).attr("id"));
- })
// Unsaved settings message before leave this page
let form_unsaved = false;
let user_interacted = false;
@@ -54,30 +26,6 @@ $(document).ready(function () {
});
})
-function fill_results(cats) {
- $("#searchResult").empty();
- cats.forEach(cat => {
- $("#searchResult").append(
- "" +
- "" + cat.fullname +"" +
- "
"
- );
-
- if (related_categories_ids.includes(cat.id)) {
- $(".search-result-item #"+ cat.id +".item-add").addClass("notClickable").attr("title", str_already_in_related_cats).on("click", function (event) {
- event.preventDefault();
- });
- $(".search-result-item").addClass("notClickable").attr("title", str_already_in_related_cats).on("click", function (event) {
- event.preventDefault();
- });
- } else {
- $(".search-result-item#"+ cat.id).on("click", function () {
- add_related_category(cat.id, cat.full_name_with_admin_links);
- });
- }
- });
-}
-
function remove_related_category(cat_id) {
$(".invisible-related-categories-select option[value="+ cat_id +"]").remove();
$(".invisible-related-categories-select").trigger('change');
@@ -107,7 +55,7 @@ function add_related_category(cat_id, cat_link_path) {
remove_related_category($(this).attr("id"))
})
- linked_albums_close();
+ close_album_selector();
}
check_related_categories();
diff --git a/admin/themes/default/template/albums.tpl b/admin/themes/default/template/albums.tpl
index d745e9fa2..6476c194d 100644
--- a/admin/themes/default/template/albums.tpl
+++ b/admin/themes/default/template/albums.tpl
@@ -328,21 +328,6 @@ const tiptip_locked_album = "{'Locked album'|translate|escape:javascript}";
max-width: 700px;
}
-.user-property-input {
- width: 100%;
- box-sizing:border-box;
- font-size:1.1em;
- padding:8px 16px;
- border:none;
-}
-
-.user-property-label {
- color:#A4A4A4;
- font-weight:bold;
- font-size:1.1em;
- margin-bottom:5px;
-}
-
.AddIconContainer, .DeleteIconContainer, .AddIconContainer {
margin-top: 10px;
}
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index bd96205f4..dbf1de563 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -51,12 +51,7 @@ jQuery("a.preview-box").colorbox( {
str_are_you_sure = '{'Are you sure?'|translate|escape:javascript}';
str_yes = '{'Yes, delete'|translate|escape:javascript}';
str_no = '{'No, I have changed my mind'|translate|@escape:'javascript'}';
-str_albums_found = '{"%d albums found"|translate|escape:javascript}';
-str_album_found = '{"1 album found"|translate|escape:javascript}';
-str_result_limit = '{"%d+ albums found, try to refine the search"|translate|escape:javascript}';
str_orphan = '{'This photo is an orphan'|@translate|escape:javascript}';
-str_no_search_in_progress = '{'No search in progress'|@translate|escape:javascript}';
-str_already_in_related_cats = '{'This albums is already in related categories list'|translate|escape:javascript}';
str_meta_warning = '{'Warning ! Unsaved changes will be lost'|translate|escape:javascript}';
str_meta_yes = '{'I want to continue'|translate|escape:javascript}'
str_meta_no = '{'No, I have changed my mind'|translate|escape:javascript}'
@@ -69,6 +64,9 @@ const strs_privacy = {
"3" : "{$level_options[1]}",
"4" : "{$level_options[0]}",
};
+const all_related_categories_ids = [];
+let related_categories_ids = [];
+let b_current_picture_id;
{/footer_script}
@@ -107,8 +105,8 @@ const strs_privacy = {
{foreach from=$elements item=element}
- {footer_script}
- var related_category_ids_{$element.ID} = {$element.related_category_ids};
+ {footer_script}
+ all_related_categories_ids.push({ id: {$element.ID}, cat_ids: {$element.related_category_ids} });
url_delete_{$element.id} = '{$element.U_DELETE}';
{/footer_script}
@@ -331,6 +329,7 @@ const strs_privacy = {
{include file='include/album_selector.inc.tpl'
title={'Associate to album'|@translate}
searchPlaceholder={'Search'|@translate}
+ admin_mode=true
}