Merge remote-tracking branch 'origin/5.0' into 5.x

.github/workflows/docs.yaml

@@ -0,0 +1,66 @@
+
+name: "Documentation"
+
+on:
+    pull_request:
+        branches:
+            - "[0-9]+.[0-9]+"
+            - "[0-9]+.x"
+        paths:
+            - 'doc/**'
+            - '.github/workflows/docs.yaml'
+    push:
+        branches:
+            - "[0-9]+.[0-9]+"
+            - "[0-9]+.x"
+            - "*_actions"
+        paths:
+            - 'doc/**'
+
+permissions:
+  contents: read
+
+jobs:
+    docs:
+        name: "Generate docs Pimcore Docs Generator"
+        runs-on: "ubuntu-latest"
+        steps:
+            - name: "Checkout code"
+              uses: "actions/checkout@v3"
+
+            - name: "Checkout Docs Generator"
+              uses: "actions/checkout@v3"
+              with:
+                  repository: "pimcore/docs-generator"
+                  ref: "main"
+                  path: "./docs-generator"
+                  token: ${{ secrets.DOCS_GENERATOR_ACCESS_TOKEN }}
+
+            - name: "Install Node"
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 19.x
+                  registry-url: 'https://registry.npmjs.org'
+
+            - name: Prepare Docs
+              working-directory: "./docs-generator"
+              run: |
+                  mkdir docs
+                  # copy docs to working directory
+                  cp -r ../doc ./docs/
+                  
+                  # copy readme to working directory
+                  cp -r ../README.md ./docs/
+                  
+                  # copy index page
+                  cp bin/resources/00_index_empty.md  ./docs/00_index.md
+                  
+                  # use special docusaurus config (to exclude search plugin) and check for broken links
+                  mv docusaurus.config.js.repos-tests docusaurus.config.js
+                  
+            - name: Build Docs
+              working-directory: "./docs-generator"
+              run: |
+                  npm install
+                  npm run build
+                  

src/Command/ReindexCommand.php

@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $list->setLimit($elementsPerLoop);
                 $list->setOffset($i * $elementsPerLoop);
 
-                $this->output->writeln('Processing ' . $class->getName() . ': ' . ($list->getOffset() + $elementsPerLoop) . '/' . $elementsTotal);
+                $this->output->writeln('Processing ' . $class->getName() . ': ' . min($list->getOffset() + $elementsPerLoop, $elementsTotal) . '/' . $elementsTotal);
 
                 $objects = $list->load();
                 foreach ($objects as $object) {

src/Migrations/PimcoreX/Version20221130130306.php

@@ -36,16 +36,18 @@ public function getDescription(): string
     public function up(Schema $schema): void
     {
         $table = $schema->getTable(Installer::QUEUE_TABLE_NAME)->getName();
-        $query = 'ALTER TABLE %s RENAME COLUMN `o_id` TO `id`;';
-
-        $this->addSql(sprintf($query, $table));
+        if ($table->hasColumn('o_id')) {
+            $query = 'ALTER TABLE %s CHANGE COLUMN `o_id` `id` bigint DEFAULT 0 NOT NULL;';
+            $this->addSql(sprintf($query, $table));
+        }
     }
 
     public function down(Schema $schema): void
     {
         $table = $schema->getTable(Installer::QUEUE_TABLE_NAME)->getName();
-        $query = 'ALTER TABLE %s RENAME COLUMN `id` TO `o_id`;';
-
-        $this->addSql(sprintf($query, $table));
+        if ($table->hasColumn('id')) {
+            $query = 'ALTER TABLE %s CHANGE COLUMN `id` `o_id` bigint DEFAULT 0 NOT NULL;';
+            $this->addSql(sprintf($query, $table));
+        }
     }
 }

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

@@ -88,7 +88,7 @@ pimcore.bundle.advancedObjectSearch.searchConfig.resultPanel = Class.create(pimc
     updateGrid: function (classId) {
         this.classId = classId;
         var classStore = pimcore.globalmanager.get("object_types_store");
-        var classRecord = classStore.findRecord("id", this.classId);
+        var classRecord = classStore.findRecord("id", this.classId, 0, false, false, true);
         if (classRecord) {
             this.selectedClass = classRecord.data.text;
 

src/Resources/translations/admin.ca.yml

@@ -0,0 +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
+...

src/Resources/translations/admin.cs.yml

@@ -0,0 +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
+...

src/Resources/translations/admin.de.yml

@@ -1,45 +1,49 @@
+---
 bundle_advancedObjectSearch: Erweiterte Objektsuche
 bundle_advancedObjectSearch_field: Feld
 bundle_advancedObjectSearch_condition: Bedingung
 bundle_advancedObjectSearch_term: Wert
 bundle_advancedObjectSearch_operator: Operator
 bundle_advancedObjectSearch_language: Sprache
-bundle_advancedObjectSearch_subclass:  Klasse
-bundle_advancedObjectSearch_filter:  Filter
-bundle_advancedObjectSearch_filters:  Filter
-bundle_advancedObjectSearch_type:  Typ
-bundle_advancedObjectSearch_ids:  IDs
-bundle_advancedObjectSearch_results:  Ergebnisse
-bundle_advancedObjectSearch_fulltextterm:  Suchbegriff
-bundle_advancedObjectSearch_save_and_share:  Speichern & Teilen
-bundle_advancedObjectSearch_share:  Teilen
-bundle_advancedObjectSearch_combine_entries_with:  Einträge kombinieren mit
-bundle_advancedObjectSearch_combine_entries_with_must:  MUSS
-bundle_advancedObjectSearch_combine_entries_with_should:  SOLLTE
+bundle_advancedObjectSearch_subclass: Klasse
+bundle_advancedObjectSearch_filter: Filter
+bundle_advancedObjectSearch_filters: Filter
+bundle_advancedObjectSearch_type: Typ
+bundle_advancedObjectSearch_ids: IDs
+bundle_advancedObjectSearch_results: Ergebnisse
+bundle_advancedObjectSearch_fulltextterm: Suchbegriff
+bundle_advancedObjectSearch_save_and_share: Speichern & Teilen
+bundle_advancedObjectSearch_share: Teilen
+bundle_advancedObjectSearch_combine_entries_with: "Eintr\xE4ge kombinieren mit"
+bundle_advancedObjectSearch_combine_entries_with_must: MUSS
+bundle_advancedObjectSearch_combine_entries_with_should: SOLLTE
 bundle_advancedObjectSearch_group: Gruppe
 bundle_advancedObjectSearch_save_success: Suche gespeichert
 bundle_advancedObjectSearch_save_error: Fehler beim Speichern der Suche
-bundle_advancedObjectSearch_category:  Kategorie
-bundle_advancedObjectSearch_open_saved_searches:  Gespeicherte Suchen öffnen
-bundle_advancedObjectSearch_new:  Neue Suche
-bundle_advancedObjectSearch_search:  Gespeicherte Suchen öffnen
-bundle_advancedObjectSearch_users:  Nutzer
-bundle_advancedObjectSearch_owner:  Besitzer
-bundle_advancedObjectSearch_save_as_copy:  Als Kopie speichern
-bundle_advancedObjectSearch_name_copy_suffix:  (Kopie)
-bundle_advancedObjectSearch_delete_error:  Fehler beim löschen der gespeicherten Suche
-bundle_advancedObjectSearch_delete_really:  Möchten Sie die gespeicherte Suche wirklich löschen?
-bundle_advancedObjectSearch_add_to_shortcuts:  Zu Schnellzugriff hinzufügen
-bundle_advancedObjectSearch_remove_from_shortcuts:  Vom Schnellzugriff entfernen
-bundle_advancedObjectSearch_short_cut_error:  Suche kann nicht zum Schnellzugriff hinzugefügt werden. Bitte speichern Sie die Suche erst.
-bundle_advancedObjectSearch_ignoreInheritance:  Keine Vererbung
-bundle_advancedObjectSearch_date:  Datum
-bundle_advancedObjectSearch_updating_index:  Suchindex wird aktualisiert
+bundle_advancedObjectSearch_category: Kategorie
+bundle_advancedObjectSearch_open_saved_searches: "Gespeicherte Suchen \xF6ffnen"
+bundle_advancedObjectSearch_new: Neue Suche
+bundle_advancedObjectSearch_search: "Gespeicherte Suchen \xF6ffnen"
+bundle_advancedObjectSearch_users: Nutzer
+bundle_advancedObjectSearch_owner: Besitzer
+bundle_advancedObjectSearch_save_as_copy: Als Kopie speichern
+bundle_advancedObjectSearch_name_copy_suffix: (Kopie)
+bundle_advancedObjectSearch_delete_error: "Fehler beim l\xF6schen der gespeicherten
+  Suche"
+bundle_advancedObjectSearch_delete_really: "M\xF6chten Sie die gespeicherte Suche
+  wirklich l\xF6schen?"
+bundle_advancedObjectSearch_add_to_shortcuts: "Zu Schnellzugriff hinzuf\xFCgen"
+bundle_advancedObjectSearch_remove_from_shortcuts: Vom Schnellzugriff entfernen
+bundle_advancedObjectSearch_short_cut_error: "Suche kann nicht zum Schnellzugriff
+  hinzugef\xFCgt werden. Bitte speichern Sie die Suche erst."
+bundle_advancedObjectSearch_ignoreInheritance: Keine Vererbung
+bundle_advancedObjectSearch_date: Datum
+bundle_advancedObjectSearch_updating_index: Suchindex wird aktualisiert
 bundle_advancedsearch_search: Erweiterte Objektsuche
 bundle_advancedsearch_operator_lt: kleiner als
 bundle_advancedsearch_operator_lte: kleiner gleich
-bundle_advancedsearch_operator_gt: größer als
-bundle_advancedsearch_operator_gte: größer gleich
+bundle_advancedsearch_operator_gt: "gr\xF6\xDFer als"
+bundle_advancedsearch_operator_gte: "gr\xF6\xDFer gleich"
 bundle_advancedsearch_operator_eq: gleich
 bundle_advancedsearch_operator_exists: existiert
 bundle_advancedsearch_operator_not_exists: existiert nicht
@@ -48,3 +52,4 @@ bundle_advancedsearch_operator_must_not: darf nicht
 bundle_advancedsearch_operator_should: sollte
 bundle_advancedObjectSearch_roles: Rollen
 bundle_advancedsearch_table_colum_config: Spalte
+...

src/Resources/translations/admin.es.yml

@@ -0,0 +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
+...