Merge remote-tracking branch 'upstream/4.3' into feature/google_analy…

…tics

app/DoctrineMigrations/Version20240312170000.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240312170000 extends AbstractMigration
+{
+    const NAME = 'dtb_block';
+
+    public function up(Schema $schema): void
+    {
+        // テーブルが存在しない場合終了
+        if (!$schema->hasTable(self::NAME)) {
+            return;
+        }
+
+        $blockExists = $this->connection->fetchOne("SELECT COUNT(*) FROM dtb_block WHERE file_name = 'auto_new_item'");
+        if ($blockExists == 0) {
+            $this->addSql("INSERT INTO dtb_block (device_type_id, block_name, file_name, create_date, update_date, use_controller, deletable, discriminator_type) VALUES (10, '新着商品（自動取得）', 'auto_new_item', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '1', '0', 'block')");
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("DELETE FROM dtb_block WHERE file_name = 'auto_new_item'");
+    }
+}

app/config/eccube/packages/eccube.yaml

@@ -173,3 +173,4 @@ parameters:
       - pdf
     eccube_login_throttling_max_attempts: 5
     eccube_login_throttling_interval: '30 minutes'
+    eccube_max_number_new_items_get: 5

html/template/admin/assets/js/file_manager.js

@@ -332,14 +332,13 @@
             eccube.fileManager.openFolder(path);
             return e.preventDefault();
         });
-        a.appendTo(label);
 
         label.attr('data-toggle', 'collapse');
         label.attr('href', '#' + path.replace('/', '_'));
         label.attr('aria-expanded', false);
         label.attr('aria-control', '');
         label.appendTo(li);
-
+        a.appendTo(li);
         if (currentPath.indexOf(path) !== 0) {
             label.addClass('collapsed')
         }