Merge branch '1.x' into remove_admin_language

composer.json

@@ -13,7 +13,7 @@
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "cbschuld/browser.php": "^1.9.6",
     "phpoffice/phpspreadsheet": "^1.24 || ^2.1",
-    "pimcore/pimcore": "^11.3",
+    "pimcore/pimcore": "11.3.0-RC1",
     "symfony/webpack-encore-bundle": "^1.13.2"
   },
   "require-dev": {

public/js/pimcore/asset/archive.js

@@ -43,8 +43,11 @@ pimcore.asset.archive = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
 
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
+
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
         }
@@ -73,7 +76,9 @@ pimcore.asset.archive = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/audio.js

@@ -43,7 +43,10 @@ pimcore.asset.audio = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -77,7 +80,9 @@ pimcore.asset.audio = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/document.js

@@ -43,7 +43,10 @@ pimcore.asset.document = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -79,7 +82,9 @@ pimcore.asset.document = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/folder.js

@@ -41,7 +41,10 @@ pimcore.asset.folder = Class.create(pimcore.asset.asset, {
         var user = pimcore.globalmanager.get("user");
 
         this.properties = new pimcore.element.properties(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -147,7 +150,9 @@ pimcore.asset.folder = Class.create(pimcore.asset.asset, {
             items.push(this.properties.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
 
         if (user.isAllowed("notes_events")) {

public/js/pimcore/asset/helpers/grid.js

@@ -230,7 +230,7 @@ pimcore.asset.helpers.grid = Class.create({
                         locked: this.getColumnLock(field),
                         renderer: function (d) {
                             var date = new Date(d * 1000);
-                            return Ext.Date.format(date, "Y-m-d H:i:s");
+                            return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getDateTimeFormat());
                         }
                     });
                 } else if (key == "filename") {

public/js/pimcore/asset/helpers/gridConfigDialog.js

@@ -365,7 +365,7 @@ pimcore.asset.helpers.gridConfigDialog = Class.create(pimcore.element.helpers.gr
                             } else if ((key == "modificationDate" || key == "creationDate") && value) {
                                 var timestamp = intval(value) * 1000;
                                 var date = new Date(timestamp);
-                                return Ext.Date.format(date, "Y-m-d H:i");
+                                return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getShortDateTimeFormat());
 
                             } else {
                                 var fieldType = record.data.dataType;

public/js/pimcore/asset/image.js

@@ -43,7 +43,10 @@ pimcore.asset.image = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -87,7 +90,9 @@ pimcore.asset.image = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/listfolder.js

@@ -374,7 +374,7 @@ pimcore.asset.listfolder = Class.create(pimcore.asset.helpers.gridTabAbstract, {
                     gridColumns.push({text: t(field.label), width: this.getColumnWidth(field, 150), sortable: true, dataIndex: field.key, editable: false, filter: 'date',
                        renderer: function(d) {
                             var date = new Date(d * 1000);
-                            return Ext.Date.format(date, "Y-m-d H:i:s");
+                            return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getDateTimeFormat());
                         }
                     });
                 } else if (key == "filename") {
@@ -396,7 +396,7 @@ pimcore.asset.listfolder = Class.create(pimcore.asset.helpers.gridTabAbstract, {
                     renderer: function(d) {
                         if (d) {
                             var date = new Date(d * 1000);
-                            return Ext.Date.format(date, "Y-m-d");
+                            return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getShortDateFormat());
                         }
 
                     }

public/js/pimcore/asset/metadata/tags/date.js

@@ -45,7 +45,7 @@ pimcore.asset.metadata.tags.date = Class.create(pimcore.asset.metadata.tags.abst
                     var timestamp = intval(value) * 1000;
                     var date = new Date(timestamp);
 
-                    return Ext.Date.format(date, "Y-m-d");
+                    return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getShortDateFormat());
                 }
                 return "";
             }.bind(this, field.key)
@@ -63,7 +63,6 @@ pimcore.asset.metadata.tags.date = Class.create(pimcore.asset.metadata.tags.abst
             name:this.fieldConfig.name,
             componentCls:"object_field",
             width:130,
-            format: "Y-m-d"
         };
 
         if (this.fieldConfig.labelWidth) {
@@ -96,9 +95,7 @@ pimcore.asset.metadata.tags.date = Class.create(pimcore.asset.metadata.tags.abst
     },
 
     getGridCellEditor: function (gridtype, record) {
-        return Ext.create('Ext.form.field.Date', {
-            format: "Y-m-d"
-        });
+        return Ext.create('Ext.form.field.Date');
     },
 
     convertPredefinedGridData: function(v, r) {
@@ -114,7 +111,7 @@ pimcore.asset.metadata.tags.date = Class.create(pimcore.asset.metadata.tags.abst
             if(!(value instanceof Date)) {
                 value = new Date(value * 1000);
             }
-            return Ext.Date.format(value, "Y-m-d");
+            return Ext.Date.format(value, pimcore.globalmanager.get('localeDateTime').getShortDateFormat());
         }
 
         return Ext.util.Format.htmlEncode(value);

public/js/pimcore/asset/text.js

@@ -43,7 +43,10 @@ pimcore.asset.text = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -75,7 +78,9 @@ pimcore.asset.text = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/unknown.js

@@ -44,7 +44,10 @@ pimcore.asset.unknown = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -74,7 +77,9 @@ pimcore.asset.unknown = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/asset/versions.js

@@ -92,14 +92,14 @@ pimcore.asset.versions = Class.create({
                         return "";
                     }.bind(this), editable: false},
                     {text: t("date"), width:150, sortable: true, dataIndex: 'date', filter: 'date', renderer: function(d) {
-                        return Ext.Date.format(d, "Y-m-d H:i:s");
+                        return Ext.Date.format(d, pimcore.globalmanager.get('localeDateTime').getDateTimeFormat());
                     }},
                     {text: "ID", sortable: true, dataIndex: 'id', editable: false, width: 60},
                     {text: t("user"), sortable: true, dataIndex: 'name', filter: 'list'},
                     {text: t("scheduled"), width:130, sortable: true, dataIndex: 'scheduled', renderer: function(d) {
                         if (d != null){
                         	var date = new Date(d * 1000);
-                            return Ext.Date.format(date, "Y-m-d H:i:s");
+                            return Ext.Date.format(date, pimcore.globalmanager.get('localeDateTime').getDateTimeFormat());
                     	}
                     }, editable: false},
                     {text: t("note"), sortable: true, dataIndex: 'note', editor: new Ext.form.TextField(), filter: 'string', renderer: Ext.util.Format.htmlEncode}

public/js/pimcore/asset/video.js

@@ -44,7 +44,10 @@ pimcore.asset.video = Class.create(pimcore.asset.asset, {
         this.properties = new pimcore.element.properties(this, "asset");
         this.versions = new pimcore.asset.versions(this);
         this.scheduler = new pimcore.element.scheduler(this, "asset");
-        this.dependencies = new pimcore.element.dependencies(this, "asset");
+
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "asset");
+        }
 
         if (user.isAllowed("notes_events")) {
             this.notes = new pimcore.element.notes(this, "asset");
@@ -82,7 +85,9 @@ pimcore.asset.video = Class.create(pimcore.asset.asset, {
             items.push(this.scheduler.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/document/editables/scheduledblock.js

@@ -103,7 +103,7 @@ pimcore.document.editables.scheduledblock = Class.create(pimcore.document.editab
             var timestamp = new Date(element.date * 1000);
 
             jumpMenuEntries.push({
-                text: Ext.Date.format(timestamp, 'Y-m-d H:i'),
+                text: Ext.Date.format(timestamp, pimcore.globalmanager.get('localeDateTime').getShortDateTimeFormat()),
                 iconCls: 'pimcore_icon_time',
                 handler: function(element, timestamp) {
                     this.dateField.setValue(timestamp);

public/js/pimcore/document/email.js

@@ -65,8 +65,10 @@ pimcore.document.email = Class.create(pimcore.document.page_snippet, {
         if (this.isAllowed("versions")) {
             this.versions = new pimcore.document.versions(this);
         }
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "document");
+        }
 
-        this.dependencies = new pimcore.element.dependencies(this, "document");
         this.preview = new pimcore.document.pages.preview(this);
         if(pimcore.globalmanager.get('customReportsPanelImplementationFactory').hasImplementation()) {
             this.reports = pimcore.globalmanager.get('customReportsPanelImplementationFactory').getNewReportInstance("document_snippet");
@@ -96,7 +98,9 @@ pimcore.document.email = Class.create(pimcore.document.page_snippet, {
             items.push(this.versions.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if(this.reports) {
             var reportLayout = this.reports.getLayout();

public/js/pimcore/document/folder.js

@@ -57,7 +57,10 @@ pimcore.document.folder = Class.create(pimcore.document.document, {
             this.notes = new pimcore.element.notes(this, "document");
         }
 
-        this.dependencies = new pimcore.element.dependencies(this, "document");
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "document");
+        }
+
         this.tagAssignment = new pimcore.element.tag.assignment(this, "document");
         this.workflows = new pimcore.element.workflows(this, "document");
     },
@@ -313,7 +316,9 @@ pimcore.document.folder = Class.create(pimcore.document.document, {
             items.push(this.properties.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (user.isAllowed("notes_events")) {
             items.push(this.notes.getLayout());

public/js/pimcore/document/hardlink.js

@@ -59,7 +59,10 @@ pimcore.document.hardlink = Class.create(pimcore.document.document, {
             this.notes = new pimcore.element.notes(this, "document");
         }
 
-        this.dependencies = new pimcore.element.dependencies(this, "document");
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "document");
+        }
+
         this.tagAssignment = new pimcore.element.tag.assignment(this, "document");
         this.workflows = new pimcore.element.workflows(this, "document");
     },
@@ -386,7 +389,9 @@ pimcore.document.hardlink = Class.create(pimcore.document.document, {
             items.push(this.properties.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (this.isAllowed("settings")) {
             items.push(this.scheduler.getLayout());

public/js/pimcore/document/link.js

@@ -59,7 +59,10 @@ pimcore.document.link = Class.create(pimcore.document.document, {
             this.notes = new pimcore.element.notes(this, "document");
         }
 
-        this.dependencies = new pimcore.element.dependencies(this, "document");
+        if (pimcore.settings.dependency) {
+            this.dependencies = new pimcore.element.dependencies(this, "document");
+        }
+
         this.tagAssignment = new pimcore.element.tag.assignment(this, "document");
         this.workflows = new pimcore.element.workflows(this, "document");
     },
@@ -383,7 +386,9 @@ pimcore.document.link = Class.create(pimcore.document.document, {
             items.push(this.properties.getLayout());
         }
 
-        items.push(this.dependencies.getLayout());
+        if (typeof this.dependencies !== "undefined") {
+            items.push(this.dependencies.getLayout());
+        }
 
         if (this.isAllowed("settings")) {
             items.push(this.scheduler.getLayout());