Merge pull request #5287 from pimcore/search_and_move

[Admin] DataObjects - Allow 'Search and Move' on Empty Folders
pimcore · Nov 19, 2019 · 469373a · 469373a
2 parents 8604b7f + 4ebd1bb
commit 469373a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/object/folder.js b/bundles/AdminBundle/Resources/public/js/pimcore/object/folder.js
@@ -227,6 +227,22 @@ pimcore.object.folder = Class.create(pimcore.object.abstract, {
                 menu: this.getMetaInfoMenuItems()
             });
 
+            buttons.push({
+                tooltip: t("search_and_move"),
+                iconCls: "pimcore_material_icon_download_zip pimcore_material_icon",
+                scale: "medium",
+                handler: pimcore.helpers.searchAndMove.bind(this, this.data.general.o_id,
+                    function () {
+                        if (this.search.grid) {
+                            this.search.grid.getStore().reload();
+                        } else {
+                            this.reload();
+                        }
+                        //refresh complete object tree as moved object(s) source is unknown
+                        pimcore.elementservice.refreshRootNodeAllTrees("object");
+                    }.bind(this), "object")
+            });
+
             buttons.push("-");
             buttons.push({
                 xtype: 'tbtext',

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/object/folder/search.js b/bundles/AdminBundle/Resources/public/js/pimcore/object/folder/search.js
@@ -315,15 +315,6 @@ pimcore.object.search = Class.create(pimcore.object.helpers.gridTabAbstract, {
             }
         });
 
-        this.searchAndMoveButton = new Ext.Button({
-            text: t("search_and_move"),
-            iconCls: "pimcore_icon_search pimcore_icon_overlay_go",
-            handler: pimcore.helpers.searchAndMove.bind(this, this.object.id,
-                function () {
-                    this.store.reload();
-                }.bind(this), "object")
-        });
-
         var exportButtons = this.getExportButtons();
         var firstButton = exportButtons.pop();
 
@@ -391,7 +382,6 @@ pimcore.object.search = Class.create(pimcore.object.helpers.gridTabAbstract, {
                 this.clearFilterButton, "->",
                 this.checkboxOnlyDirectChildren, "-",
                 this.sqlEditor, this.sqlButton, "-",
-                this.searchAndMoveButton, "-",
                 this.exportButton, "-",
                 this.columnConfigButton,
                 this.saveColumnConfigButton