#48 [Medias] fix: multiple errors management on send photo action

Evarisk · Jan 27, 2023 · ab24ff6 · ab24ff6
1 parent 9cc8f22
commit ab24ff6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/core/tpl/medias_gallery_modal.tpl.php b/core/tpl/medias_gallery_modal.tpl.php
@@ -9,7 +9,7 @@
 
 	// Define relativepath and upload_dir
 	$relativepath                                             = $module . '/medias';
-	$uploadDir                                               = $conf->ecm->dir_output . '/' . $relativepath;
+	$uploadDir                                                = $conf->ecm->dir_output . '/' . $relativepath;
 	if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
 	else $userfiles                                           = array($_FILES['userfile']['tmp_name']);
 

diff --git a/js/modules/mediaGallery.js b/js/modules/mediaGallery.js
@@ -187,14 +187,15 @@ window.saturne.mediaGallery.sendPhoto = function( event ) {
 	let objectSubtype    = mediaGallery.find('.from-subtype').length ? mediaGallery.find('.from-subtype').val() : ''
 	let objectSubdir     = mediaGallery.find('.from-subdir').length ? mediaGallery.find('.from-subdir').val() : ''
 
-	let token = window.saturne.toolbox.getToken();;
+	let token = window.saturne.toolbox.getToken();
 
 	$('#progressBar').width(0)
 	$('#progressBarContainer').attr('style', 'display:block')
 
 	window.saturne.loader.display($('#progressBarContainer'));
 
 	let querySeparator = window.saturne.toolbox.getQuerySeparator(document.URL)
+	let textToShow = '';
 
 	$.each(files, function(index, file) {
 		let formdata = new FormData();
@@ -211,6 +212,10 @@ window.saturne.mediaGallery.sendPhoto = function( event ) {
 				$('#progressBar').animate({
 					width: progress + '%'
 				}, 1);
+				let errorMessage = $(resp).find('.error-medias').val()
+				let decodedErrorMessage = JSON.parse(errorMessage)
+
+				textToShow += decodedErrorMessage.message + '<br>'
 
 				if (requestCompleted === totalCount) {
 					$('.wpeo-loader').removeClass('wpeo-loader');
@@ -224,13 +229,7 @@ window.saturne.mediaGallery.sendPhoto = function( event ) {
 								$('#media_gallery').find('.clickable-photo0').addClass('clicked-photo');
 							}
 							if ($(resp).find('.error-medias').length) {
-								let response = $(resp).find('.error-medias').val()
-								let decoded_response = JSON.parse(response)
-
-								let textToShow = '';
-								textToShow += decoded_response.message
-
-								$('.messageErrorSendPhoto').find('.notice-subtitle').text(textToShow)
+								$('.messageErrorSendPhoto').find('.notice-subtitle').html(textToShow)
 								$('.messageErrorSendPhoto').removeClass('hidden');
 							} else {
 								$('.messageSuccessSendPhoto').removeClass('hidden');

diff --git a/js/modules/toolbox.js b/js/modules/toolbox.js
@@ -39,7 +39,6 @@ window.saturne.toolbox = {};
  * @return {void}
  */
 window.saturne.toolbox.init = function() {
-	window.saturne.toolbox.event();
 };
 
 /**
@@ -63,7 +62,7 @@ window.saturne.toolbox.getQuerySeparator = function( url ) {
  *
  * @return {string}
  */
-window.saturne.toolbox.window.saturne.toolbox.getToken = function() {
+window.saturne.toolbox.getToken = function() {
 	let token = $('input[name="token"]').val();
 
 	return token

diff --git a/js/saturne.min.js b/js/saturne.min.js