Merge branch '5.0' into 5.x

src/Filter/FieldDefinitionAdapter/Table.php

@@ -108,6 +108,10 @@ protected function doGetIndexDataValue($object, $ignoreInheritance = false)
         if ($this->isColumnConfigActivated()) {
             // When saving an object the array doesnt have named keys, so first get data for resource
             // and then get the data from resource. This way we have named keys in the data array
+            if (!$object instanceof Concrete) {
+                $object = null;
+            }
+
             $value = $this->fieldDefinition->getDataFromResource($this->fieldDefinition->getDataForResource($value, $object));
         }
 

src/Model/SavedSearch/Dao.php

@@ -64,7 +64,8 @@ public function save()
                 }
             }
 
-            Helper::upsert($this->db, self::TABLE_NAME, $data, $this->getPrimaryKey(self::TABLE_NAME));
+            $quoteIdentifiers = \Pimcore\Version::getMajorVersion() >= 11;
+            Helper::upsert($this->db, self::TABLE_NAME, $data, $this->getPrimaryKey(self::TABLE_NAME), $quoteIdentifiers);
 
             $lastInsertId = $this->db->lastInsertId();
             if (!$this->model->getId() && $lastInsertId) {

src/Resources/config/pimcore/config.yml

@@ -1,10 +1,7 @@
 framework:
     messenger:
         transports:
-            pimcore_index_queues:
-                dsn: 'doctrine://default'
-                options:
-                    queue_name: pimcore_index_queues
+            pimcore_index_queues: "doctrine://default?queue_name=pimcore_index_queues"
 
         routing:
             'AdvancedObjectSearchBundle\Messenger\QueueMessage': pimcore_index_queues

src/Resources/public/js/searchConfig/resultPanel.js

@@ -435,7 +435,7 @@ pimcore.bundle.advancedObjectSearch.searchConfig.resultPanel = Class.create(pimc
             for (var i = 0; i < selectedRows.length; i++) {
                 jobs.push(selectedRows[i].get("id"));
             }
-            this.batchOpen(columnIndex, jobs, append, remove);
+            this.batchOpen(columnIndex, jobs, append, remove, onlySelected);
 
         } else {
 
@@ -467,7 +467,7 @@ pimcore.bundle.advancedObjectSearch.searchConfig.resultPanel = Class.create(pimc
                 success: function (columnIndex, response) {
                     var rdata = Ext.decode(response.responseText);
                     if (rdata.success && rdata.jobs) {
-                        this.batchOpen(columnIndex, rdata.jobs, append, remove);
+                        this.batchOpen(columnIndex, rdata.jobs, append, remove, onlySelected);
                     }
 
                 }.bind(this, columnIndex)

src/Resources/translations/admin.ca.yml

@@ -1,53 +1,53 @@
----
-bundle_advancedObjectSearch: Advanced Object Search
-bundle_advancedObjectSearch_field: Field
-bundle_advancedObjectSearch_condition: Condition
-bundle_advancedObjectSearch_term: Term
-bundle_advancedObjectSearch_operator: Operator
-bundle_advancedObjectSearch_language: Language
-bundle_advancedObjectSearch_subclass: Class
-bundle_advancedObjectSearch_filter: Filter
-bundle_advancedObjectSearch_filters: Filters
-bundle_advancedObjectSearch_type: Type
-bundle_advancedObjectSearch_ids: IDs
-bundle_advancedObjectSearch_results: Results
-bundle_advancedObjectSearch_fulltextterm: Search Term
-bundle_advancedObjectSearch_save_and_share: Save And Share
-bundle_advancedObjectSearch_share: Sharing
-bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
-bundle_advancedObjectSearch_combine_entries_with_must: MUST
-bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
-bundle_advancedObjectSearch_group: Group
-bundle_advancedObjectSearch_save_success: Search saved successfully
-bundle_advancedObjectSearch_save_error: Error occurred during save search
-bundle_advancedObjectSearch_category: Category
-bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
-bundle_advancedObjectSearch_new: New
-bundle_advancedObjectSearch_search: Open existing Saved Search
-bundle_advancedObjectSearch_users: Users
-bundle_advancedObjectSearch_owner: Owner
-bundle_advancedObjectSearch_save_as_copy: Save as Copy
-bundle_advancedObjectSearch_name_copy_suffix: (copy)
-bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
-bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
-  Search?
-bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
-bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
-bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
-bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
-bundle_advancedObjectSearch_date: Date
-bundle_advancedObjectSearch_updating_index: Currently updating search index
-bundle_advancedsearch_search: Advanced Object Search
-bundle_advancedsearch_operator_lt: lower than
-bundle_advancedsearch_operator_lte: lower or equal
-bundle_advancedsearch_operator_gt: greater than
-bundle_advancedsearch_operator_gte: greater or equal
-bundle_advancedsearch_operator_eq: equal
-bundle_advancedsearch_operator_exists: exists
-bundle_advancedsearch_operator_not_exists: not exists
-bundle_advancedsearch_operator_must: must
-bundle_advancedsearch_operator_must_not: must not
-bundle_advancedsearch_operator_should: should
-bundle_advancedObjectSearch_roles: Roles
-bundle_advancedsearch_table_colum_config: Column
-...
+---
+bundle_advancedObjectSearch: Advanced Object Search
+bundle_advancedObjectSearch_field: Field
+bundle_advancedObjectSearch_condition: Condition
+bundle_advancedObjectSearch_term: Term
+bundle_advancedObjectSearch_operator: Operator
+bundle_advancedObjectSearch_language: Language
+bundle_advancedObjectSearch_subclass: Class
+bundle_advancedObjectSearch_filter: Filter
+bundle_advancedObjectSearch_filters: Filters
+bundle_advancedObjectSearch_type: Type
+bundle_advancedObjectSearch_ids: IDs
+bundle_advancedObjectSearch_results: Results
+bundle_advancedObjectSearch_fulltextterm: Search Term
+bundle_advancedObjectSearch_save_and_share: Save And Share
+bundle_advancedObjectSearch_share: Sharing
+bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
+bundle_advancedObjectSearch_combine_entries_with_must: MUST
+bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
+bundle_advancedObjectSearch_group: Group
+bundle_advancedObjectSearch_save_success: Search saved successfully
+bundle_advancedObjectSearch_save_error: Error occurred during save search
+bundle_advancedObjectSearch_category: Category
+bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
+bundle_advancedObjectSearch_new: New
+bundle_advancedObjectSearch_search: Open existing Saved Search
+bundle_advancedObjectSearch_users: Users
+bundle_advancedObjectSearch_owner: Owner
+bundle_advancedObjectSearch_save_as_copy: Save as Copy
+bundle_advancedObjectSearch_name_copy_suffix: (copy)
+bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
+bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
+  Search?
+bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
+bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
+bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
+bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
+bundle_advancedObjectSearch_date: Date
+bundle_advancedObjectSearch_updating_index: Currently updating search index
+bundle_advancedsearch_search: Advanced Object Search
+bundle_advancedsearch_operator_lt: lower than
+bundle_advancedsearch_operator_lte: lower or equal
+bundle_advancedsearch_operator_gt: greater than
+bundle_advancedsearch_operator_gte: greater or equal
+bundle_advancedsearch_operator_eq: equal
+bundle_advancedsearch_operator_exists: exists
+bundle_advancedsearch_operator_not_exists: not exists
+bundle_advancedsearch_operator_must: must
+bundle_advancedsearch_operator_must_not: must not
+bundle_advancedsearch_operator_should: should
+bundle_advancedObjectSearch_roles: Roles
+bundle_advancedsearch_table_colum_config: Column
+...

src/Resources/translations/admin.cs.yml

@@ -1,53 +1,53 @@
----
-bundle_advancedObjectSearch: Advanced Object Search
-bundle_advancedObjectSearch_field: Field
-bundle_advancedObjectSearch_condition: Condition
-bundle_advancedObjectSearch_term: Term
-bundle_advancedObjectSearch_operator: Operator
-bundle_advancedObjectSearch_language: Language
-bundle_advancedObjectSearch_subclass: Class
-bundle_advancedObjectSearch_filter: Filter
-bundle_advancedObjectSearch_filters: Filters
-bundle_advancedObjectSearch_type: Type
-bundle_advancedObjectSearch_ids: IDs
-bundle_advancedObjectSearch_results: Results
-bundle_advancedObjectSearch_fulltextterm: Search Term
-bundle_advancedObjectSearch_save_and_share: Save And Share
-bundle_advancedObjectSearch_share: Sharing
-bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
-bundle_advancedObjectSearch_combine_entries_with_must: MUST
-bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
-bundle_advancedObjectSearch_group: Group
-bundle_advancedObjectSearch_save_success: Search saved successfully
-bundle_advancedObjectSearch_save_error: Error occurred during save search
-bundle_advancedObjectSearch_category: Category
-bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
-bundle_advancedObjectSearch_new: New
-bundle_advancedObjectSearch_search: Open existing Saved Search
-bundle_advancedObjectSearch_users: Users
-bundle_advancedObjectSearch_owner: Owner
-bundle_advancedObjectSearch_save_as_copy: Save as Copy
-bundle_advancedObjectSearch_name_copy_suffix: (copy)
-bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
-bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
-  Search?
-bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
-bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
-bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
-bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
-bundle_advancedObjectSearch_date: Date
-bundle_advancedObjectSearch_updating_index: Currently updating search index
-bundle_advancedsearch_search: Advanced Object Search
-bundle_advancedsearch_operator_lt: lower than
-bundle_advancedsearch_operator_lte: lower or equal
-bundle_advancedsearch_operator_gt: greater than
-bundle_advancedsearch_operator_gte: greater or equal
-bundle_advancedsearch_operator_eq: equal
-bundle_advancedsearch_operator_exists: exists
-bundle_advancedsearch_operator_not_exists: not exists
-bundle_advancedsearch_operator_must: must
-bundle_advancedsearch_operator_must_not: must not
-bundle_advancedsearch_operator_should: should
-bundle_advancedObjectSearch_roles: Roles
-bundle_advancedsearch_table_colum_config: Column
-...
+---
+bundle_advancedObjectSearch: Advanced Object Search
+bundle_advancedObjectSearch_field: Field
+bundle_advancedObjectSearch_condition: Condition
+bundle_advancedObjectSearch_term: Term
+bundle_advancedObjectSearch_operator: Operator
+bundle_advancedObjectSearch_language: Language
+bundle_advancedObjectSearch_subclass: Class
+bundle_advancedObjectSearch_filter: Filter
+bundle_advancedObjectSearch_filters: Filters
+bundle_advancedObjectSearch_type: Type
+bundle_advancedObjectSearch_ids: IDs
+bundle_advancedObjectSearch_results: Results
+bundle_advancedObjectSearch_fulltextterm: Search Term
+bundle_advancedObjectSearch_save_and_share: Save And Share
+bundle_advancedObjectSearch_share: Sharing
+bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
+bundle_advancedObjectSearch_combine_entries_with_must: MUST
+bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
+bundle_advancedObjectSearch_group: Group
+bundle_advancedObjectSearch_save_success: Search saved successfully
+bundle_advancedObjectSearch_save_error: Error occurred during save search
+bundle_advancedObjectSearch_category: Category
+bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
+bundle_advancedObjectSearch_new: New
+bundle_advancedObjectSearch_search: Open existing Saved Search
+bundle_advancedObjectSearch_users: Users
+bundle_advancedObjectSearch_owner: Owner
+bundle_advancedObjectSearch_save_as_copy: Save as Copy
+bundle_advancedObjectSearch_name_copy_suffix: (copy)
+bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
+bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
+  Search?
+bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
+bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
+bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
+bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
+bundle_advancedObjectSearch_date: Date
+bundle_advancedObjectSearch_updating_index: Currently updating search index
+bundle_advancedsearch_search: Advanced Object Search
+bundle_advancedsearch_operator_lt: lower than
+bundle_advancedsearch_operator_lte: lower or equal
+bundle_advancedsearch_operator_gt: greater than
+bundle_advancedsearch_operator_gte: greater or equal
+bundle_advancedsearch_operator_eq: equal
+bundle_advancedsearch_operator_exists: exists
+bundle_advancedsearch_operator_not_exists: not exists
+bundle_advancedsearch_operator_must: must
+bundle_advancedsearch_operator_must_not: must not
+bundle_advancedsearch_operator_should: should
+bundle_advancedObjectSearch_roles: Roles
+bundle_advancedsearch_table_colum_config: Column
+...

src/Resources/translations/admin.es.yml

@@ -1,53 +1,53 @@
----
-bundle_advancedObjectSearch: Advanced Object Search
-bundle_advancedObjectSearch_field: Field
-bundle_advancedObjectSearch_condition: Condition
-bundle_advancedObjectSearch_term: Term
-bundle_advancedObjectSearch_operator: Operator
-bundle_advancedObjectSearch_language: Language
-bundle_advancedObjectSearch_subclass: Class
-bundle_advancedObjectSearch_filter: Filter
-bundle_advancedObjectSearch_filters: Filters
-bundle_advancedObjectSearch_type: Type
-bundle_advancedObjectSearch_ids: IDs
-bundle_advancedObjectSearch_results: Results
-bundle_advancedObjectSearch_fulltextterm: Search Term
-bundle_advancedObjectSearch_save_and_share: Save And Share
-bundle_advancedObjectSearch_share: Sharing
-bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
-bundle_advancedObjectSearch_combine_entries_with_must: MUST
-bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
-bundle_advancedObjectSearch_group: Group
-bundle_advancedObjectSearch_save_success: Search saved successfully
-bundle_advancedObjectSearch_save_error: Error occurred during save search
-bundle_advancedObjectSearch_category: Category
-bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
-bundle_advancedObjectSearch_new: New
-bundle_advancedObjectSearch_search: Open existing Saved Search
-bundle_advancedObjectSearch_users: Users
-bundle_advancedObjectSearch_owner: Owner
-bundle_advancedObjectSearch_save_as_copy: Save as Copy
-bundle_advancedObjectSearch_name_copy_suffix: (copy)
-bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
-bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
-  Search?
-bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
-bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
-bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
-bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
-bundle_advancedObjectSearch_date: Date
-bundle_advancedObjectSearch_updating_index: Currently updating search index
-bundle_advancedsearch_search: Advanced Object Search
-bundle_advancedsearch_operator_lt: lower than
-bundle_advancedsearch_operator_lte: lower or equal
-bundle_advancedsearch_operator_gt: greater than
-bundle_advancedsearch_operator_gte: greater or equal
-bundle_advancedsearch_operator_eq: equal
-bundle_advancedsearch_operator_exists: exists
-bundle_advancedsearch_operator_not_exists: not exists
-bundle_advancedsearch_operator_must: must
-bundle_advancedsearch_operator_must_not: must not
-bundle_advancedsearch_operator_should: should
-bundle_advancedObjectSearch_roles: Roles
-bundle_advancedsearch_table_colum_config: Column
-...
+---
+bundle_advancedObjectSearch: Advanced Object Search
+bundle_advancedObjectSearch_field: Field
+bundle_advancedObjectSearch_condition: Condition
+bundle_advancedObjectSearch_term: Term
+bundle_advancedObjectSearch_operator: Operator
+bundle_advancedObjectSearch_language: Language
+bundle_advancedObjectSearch_subclass: Class
+bundle_advancedObjectSearch_filter: Filter
+bundle_advancedObjectSearch_filters: Filters
+bundle_advancedObjectSearch_type: Type
+bundle_advancedObjectSearch_ids: IDs
+bundle_advancedObjectSearch_results: Results
+bundle_advancedObjectSearch_fulltextterm: Search Term
+bundle_advancedObjectSearch_save_and_share: Save And Share
+bundle_advancedObjectSearch_share: Sharing
+bundle_advancedObjectSearch_combine_entries_with: Combine Entries with
+bundle_advancedObjectSearch_combine_entries_with_must: MUST
+bundle_advancedObjectSearch_combine_entries_with_should: SHOULD
+bundle_advancedObjectSearch_group: Group
+bundle_advancedObjectSearch_save_success: Search saved successfully
+bundle_advancedObjectSearch_save_error: Error occurred during save search
+bundle_advancedObjectSearch_category: Category
+bundle_advancedObjectSearch_open_saved_searches: Open saved Searches
+bundle_advancedObjectSearch_new: New
+bundle_advancedObjectSearch_search: Open existing Saved Search
+bundle_advancedObjectSearch_users: Users
+bundle_advancedObjectSearch_owner: Owner
+bundle_advancedObjectSearch_save_as_copy: Save as Copy
+bundle_advancedObjectSearch_name_copy_suffix: (copy)
+bundle_advancedObjectSearch_delete_error: Error during deleting Saved Search
+bundle_advancedObjectSearch_delete_really: Do you really want to delete the Saved
+  Search?
+bundle_advancedObjectSearch_add_to_shortcuts: Add To Short Cuts
+bundle_advancedObjectSearch_remove_from_shortcuts: Remove From Short Cuts
+bundle_advancedObjectSearch_short_cut_error: Cannot add short cut for not saved search
+bundle_advancedObjectSearch_ignoreInheritance: No Inheritance
+bundle_advancedObjectSearch_date: Date
+bundle_advancedObjectSearch_updating_index: Currently updating search index
+bundle_advancedsearch_search: Advanced Object Search
+bundle_advancedsearch_operator_lt: lower than
+bundle_advancedsearch_operator_lte: lower or equal
+bundle_advancedsearch_operator_gt: greater than
+bundle_advancedsearch_operator_gte: greater or equal
+bundle_advancedsearch_operator_eq: equal
+bundle_advancedsearch_operator_exists: exists
+bundle_advancedsearch_operator_not_exists: not exists
+bundle_advancedsearch_operator_must: must
+bundle_advancedsearch_operator_must_not: must not
+bundle_advancedsearch_operator_should: should
+bundle_advancedObjectSearch_roles: Roles
+bundle_advancedsearch_table_colum_config: Column
+...