Merge branch 'develop' into trunk

resources/js/components/media-manager/MmFolderComponent.vue

@@ -186,17 +186,21 @@ export default {
     const data = JSON.parse(this.$parent.$options.json);
     if (data.selectedFolder && data.selectedFolder != -1) {
         this.selectedFolder = data.selectedFolder;
-        this.selectFolder(data.selectedFolder);
+        this.selectedSubject = data.selectedSubject;
         this.$store.commit({
             type: "updateFolder",
             folder: data.selectedFolder.id ?? -1,
         });
         this.storeFolder = data.selectedFolder.id;
+        this.$nextTick(() => {
+            this.initFolders(this.selectedFolder, this.selectedSubject);
+        })
     }
   },
   data() {
     return {
       selectedFolder: false,
+      selectedSubject: false,
       isLoading: true,
       oFolders: [],
       racineCount: 0,
@@ -205,7 +209,7 @@ export default {
   },
   watch: {
     storeSujet() {
-      this.initFolders(this.selectedFolder);
+      this.initFolders();
       this.selectedFolder = null;
     },
     storeReload() {
@@ -237,7 +241,7 @@ export default {
         });
       }
     },
-    initFolders(toSelectFolder = false) {
+    initFolders(toSelectFolder = false, selectedSubject = false) {
       const self = this;
       self.isLoading = true;
       self.folders = [];
@@ -245,7 +249,7 @@ export default {
       axios
         .get("/ajax/load-folders", {
           params: {
-            sujet_id: self.storeSujet,
+            sujet_id: selectedSubject ? selectedSubject : self.storeSujet,
           },
         })
         .then((response) => {