Merge 70000ea into 961c45a

EC-CUBE · Jul 19, 2018 · 4f73d98 · 4f73d98
2 parents 961c45a + 70000ea
commit 4f73d98
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/codeception/_support/Page/Admin/LayoutEditPage.php b/codeception/_support/Page/Admin/LayoutEditPage.php
@@ -32,9 +32,6 @@ public function 登録()
 
     public function ブロックを移動($blockName, $dest, $timeout = 10)
     {
-        if (mb_strlen($blockName) > 10) {
-            $blockName = mb_substr($blockName, 0, 10).'…';
-        }
         $this->tester->waitForElementVisible(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][a[text()='${blockName}']]]]"], $timeout);
         $this->tester->dragAndDrop(['xpath' => "//div[contains(@id, 'detail_box__layout_item')][div[div[1][a[text()='${blockName}']]]]"], $dest);
         return $this;

diff --git a/src/Eccube/Resource/template/admin/Content/layout.twig b/src/Eccube/Resource/template/admin/Content/layout.twig
@@ -443,7 +443,7 @@ file that was distributed with this source code.
                                                                    data-id="{{ UnusedBlock.id }}"
                                                                    data-name="{{ UnusedBlock.name }}"
                                                                    title="{{ UnusedBlock.name }}"
-                                                                >{{ UnusedBlock.name|length > 10 ? UnusedBlock.name|slice(0, 10) ~ '…' : UnusedBlock.name }}</a>
+                                                                >{{ UnusedBlock.name }}</a>
                                                             </div>
                                                             <div class="col-auto text-right">
                                                                 <input type="hidden" class="name" name="name_{{ loop_index }}"

diff --git a/src/Eccube/Resource/template/admin/Content/layout_block.twig b/src/Eccube/Resource/template/admin/Content/layout_block.twig
@@ -17,7 +17,7 @@ file that was distributed with this source code.
                data-id="{{ BlockPosition.Block.id }}"
                data-name="{{ BlockPosition.Block.name }}"
                title="{{ BlockPosition.Block.name }}"
-            >{{ BlockPosition.Block.name|length > 10 ? BlockPosition.Block.name|slice(0, 10) ~ '…' : BlockPosition.Block.name }}</a>
+            >{{ BlockPosition.Block.name }}</a>
         </div>
         <div class="col-auto text-right">
             <div class="d-inline-block px-3 sort{% if loop.first %} first{% endif %}">