Merge remote-tracking branch 'origin/2.0' into 2.x

Author: mcop1

.github/ci/files/config/bundles.php

@@ -2,4 +2,5 @@
 
 return [
     'Pimcore\\Bundle\\AdminBundle\\PimcoreAdminBundle' => ['all' => true],
+    'Pimcore\\Bundle\\SeoBundle\\PimcoreSeoBundle' => ['all' => true],
 ];

public/js/pimcore/layout/portal.js

@@ -121,7 +121,7 @@ pimcore.layout.portal = Class.create({
             this.panel = Ext.create('Portal.view.PortalPanel', {
                 id: "pimcore_portal_" + this.key,
                 layout: 'column',
-                title: this.key == "welcome" ? t("welcome") : this.key,
+                title: t(this.key),
                 border: true,
                 bodyCls: 'x-portal-body',
                 iconCls: "pimcore_icon_welcome",

public/js/pimcore/layout/toolbar.js

@@ -89,7 +89,7 @@ pimcore.layout.toolbar = Class.create({
                          var data = Ext.decode(response.responseText);
                          for (var i = 0; i < data.length; i++) {
                              this.dashboardMenu.menu.add({
-                                 text: data[i],
+                                 text: t(data[i]),
                                  iconCls: "pimcore_nav_icon_dashboards",
                                  itemId: 'pimcore_menu_file_dashboards_custom_' + data[i],
                                  handler: function (key) {

public/js/pimcore/object/quantityvalue/unitsettings.js

@@ -183,7 +183,7 @@ pimcore.object.quantityValue.unitsettings = Class.create({
                     try {
                         baseUnitStore.reload({
                             page: this.store.currentPage,
-                            start: 1,
+                            start: 0,
                             limit: 9999
                         });
                         Ext.apply(baseUnitStore, {pageSize: this.pagingtoolbar.pageSize});

public/js/pimcore/object/tags/advancedManyToManyObjectRelation.js

@@ -495,7 +495,14 @@ pimcore.object.tags.advancedManyToManyObjectRelation = Class.create(pimcore.obje
             plugins: [
                 this.cellEditing,
                 'gridfilters'
-            ]
+            ],
+            listeners: {
+                celldblclick: function (grid, cell, cellIndex, record) {
+                    if (cellIndex < visibleFields.length) {
+                        this.gridRowDblClickHandler(grid, record);
+                    }
+                }.bind(this)
+            }
         });
 
         if (!readOnly) {

public/js/pimcore/object/tags/advancedManyToManyRelation.js

@@ -467,7 +467,14 @@ pimcore.object.tags.advancedManyToManyRelation = Class.create(pimcore.object.tag
             plugins: [
                 this.cellEditing,
                 'gridfilters'
-            ]
+            ],
+            listeners: {
+                celldblclick: function (grid, cell, cellIndex, record) {
+                    if (cellIndex < visibleFields.length) {
+                        this.gridRowDblClickHandler(grid, record);
+                    }
+                }.bind(this)
+            }
         });
 
         this.component.on("rowcontextmenu", this.onRowContextmenu.bind(this));

public/js/pimcore/object/tags/localizedfields.js

@@ -316,7 +316,7 @@ pimcore.object.tags.localizedfields = Class.create(pimcore.object.tags.abstract,
                         border: false,
                         padding: "10px",
                         items: items,
-                        hidden: (i > 0)     //TODO default language
+                        hidden: (this.globalLanguage ? this.globalLanguage !== currentLanguage : i > 0)
                     };
 
                     if (this.fieldConfig.height) {

public/js/pimcore/settings/thumbnail/item.js

@@ -153,6 +153,11 @@ pimcore.settings.thumbnail.item = Class.create({
                         name: "preserveColor",
                         boxLabel: t("preserve_color") + " (Imagick, ORIGINAL)",
                         checked: this.data.preserveColor
+                    }, {
+                        xtype: "checkbox",
+                        name: "forceProcessICCProfiles",
+                        boxLabel: t("force_process_ICC_profiles") + " (Imagick, ORIGINAL)",
+                        checked: this.data.forceProcessICCProfiles
                     }, {
                         xtype: "checkbox",
                         name: "preserveMetaData",

src/Helper/GridHelperService.php

@@ -838,7 +838,7 @@ public function prepareAssetListingForGrid(array $allParams, User $adminUser): M
                     $value = '(' . implode(',', $quoted) . ')';
                 } elseif ($operator == 'BETWEEN') {
                 } else {
-                    $value = $db->quote($value);
+                    $value = $db->quote((string)$value);
                 }
 
                 if (isset($filterDef[1]) && $filterDef[1] == 'system') {

templates/admin/login/two_factor_authentication.html.twig

@@ -11,7 +11,7 @@
         </div>
     {% endif %}
 
-    <form method="post" action="{{ path('pimcore_admin_2fa-verify') }}">
+    <form method="post" action="{{ path('pimcore_admin_2fa_verify') }}">
         <input name="_auth_code" id="_auth_code" autocomplete="one-time-code" type="password" placeholder="{{ '2fa_code'|trans([],'admin') }}" required autofocus>
         <input type="hidden" name="csrfToken" value="{{ pimcore_csrf.getCsrfToken(app.request.session) }}">