Merge branch 'b-7.1.x-OXDEV-8840' into b-7.1.x

OXID-eSales · Oct 23, 2024 · cd598ae · cd598ae
2 parents fc6abdd + 01fd52e
commit cd598ae
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.1] - Unreleased
+
+### Fixed
+- Fixed empty error box for errorous add folder and rename folder actions
+
 ## [2.0.0] - 2024-10-10
 
 ### Added
@@ -43,5 +48,6 @@ Module extracted from wysiwyg module, and used by it now
 - Thumbnails are generated on demand and the type of thumbnail file is matching the original image type
 - Alternative image directory setting renamed to fit its functionality: Alternative image URL
 
+[2.0.1]: https://github.com/OXID-eSales/media-library-module/compare/v2.0.0..v2.0.1
 [2.0.0]: https://github.com/OXID-eSales/media-library-module/compare/v1.0.0..v2.0.0
 [1.0.0]: https://github.com/OXID-eSales/media-library-module/compare/f18ab07..v1.0.0
diff --git a/assets/out/src/js/base.min.js b/assets/out/src/js/base.min.js
diff --git a/assets/out/src/js/base.min.js.map b/assets/out/src/js/base.min.js.map
diff --git a/build/js/base/medialibrary.js b/build/js/base/medialibrary.js
@@ -516,8 +516,8 @@
                                 $('.dd-media-file-count', $dialog).text(parseInt($('.dd-media-file-count', $dialog).text()) + 1);
                             }
                         },
-                        error: function (result, status, errorThrown) {
-                            ddh.alert(ddh.translate(errorThrown));
+                        error: function (result) {
+                            ddh.alert(ddh.translate(result.responseJSON.error));
                         }
                     });
                 });
@@ -610,8 +610,8 @@
                                     $('.dd-media-item-label span', activeItem).text(resultJson.name);
                                     ui._loadItemDetails(activeItem.data(), $dialog);
                                 },
-                                error: function (result, status, errorThrown) {
-                                    ddh.alert(ddh.translate(errorThrown));
+                                error: function (result) {
+                                    ddh.alert(ddh.translate(result.responseJSON.error));
                                 }
                             });
                         }