Skip to content

Commit

Permalink
Category::level -> Category::hierarchy
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanasess
nanasess committed Sep 26, 2017
1 parent 411def6 commit efaa253
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion src/Eccube/Resource/template/admin/Product/category.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<div id="edit_box__body_inner" class="col-md-9">
<form role="form" class="form-horizontal" name="form1" id="form1" method="post" action="{% if TargetCategory.id %}{{ path('admin_product_category_edit', {id: TargetCategory.id}) }}{% elseif Parent %}{{ url('admin_product_category_show', {'parent_id': Parent.id}) }}{% else %}{{ url('admin_product_category') }}{% endif %}" enctype="multipart/form-data">
<div class="form-group">
{% if TargetCategory.level < app.config.category_nest_level %}
{% if TargetCategory.hierarchy < app.config.category_nest_level %}
<div class="col-md-12 form-inline">
{{ form_widget(form._token) }}
{{ form_widget(form.name, {attr: {placeholder: 'カテゴリ名を入力'}}) }}
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/Product/category_tree_fork.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#}
<ul{% if treeId is defined %} id="{{ treeId }}"{% endif %}{%if disp_child is not defined or disp_child == false %} style="display: none;"{% endif %}>
{% for Child in Children %}
<li class="level{{ Child.level }}">
<li class="level{{ Child.hierarchy }}">
{# カテゴリ名表示 #}
{% if Child.level < app.config.level_max %}
{% if Child.hierarchy < app.config.level_max %}
<a href="{{ url('admin_product_category_show', {parent_id: Child.id}) }}">
{% if Parent and Parent.id == Child.id %}
<img src="{{ app.config.admin_tpl }}img/contents/folder_open.gif" alt="フォルダ" />
Expand Down
22 changes: 11 additions & 11 deletions tests/Eccube/Tests/Plugin/Web/Admin/Product/CategoryContorllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@ public function setUp()
public function createCategories()
{
$categories = array(
array('name' => '親1', 'level' => 1, 'rank' => 1,
array('name' => '親1', 'hierarchy' => 1, 'rank' => 1,
'child' => array(
array('name' => '子1', 'level' => 2, 'rank' => 4,
array('name' => '子1', 'hierarchy' => 2, 'rank' => 4,
'child' => array(
array('name' => '孫1', 'level' => 3, 'rank' => 9)
array('name' => '孫1', 'hierarchy' => 3, 'rank' => 9)
),
),
),
),
array('name' => '親2', 'level' => 1, 'rank' => 2,
array('name' => '親2', 'hierarchy' => 1, 'rank' => 2,
'child' => array(
array('name' => '子2-0', 'level' => 2, 'rank' => 5,
array('name' => '子2-0', 'hierarchy' => 2, 'rank' => 5,
'child' => array(
array('name' => '孫2', 'level' => 3, 'rank' => 10)
array('name' => '孫2', 'hierarchy' => 3, 'rank' => 10)
)
),
array('name' => '子2-1', 'level' => 2, 'rank' => 6),
array('name' => '子2-2', 'level' => 2, 'rank' => 7)
array('name' => '子2-1', 'hierarchy' => 2, 'rank' => 6),
array('name' => '子2-2', 'hierarchy' => 2, 'rank' => 7)
),
),
array('name' => '親3', 'level' => 1, 'rank' => 3,
array('name' => '親3', 'hierarchy' => 1, 'rank' => 3,
'child' => array(
array('name' => '子3', 'level' => 2, 'rank' => 8,
array('name' => '子3', 'hierarchy' => 2, 'rank' => 8,
'child' => array(
array('name' => '孫3', 'level' => 3, 'rank' => 11)
array('name' => '孫3', 'hierarchy' => 3, 'rank' => 11)
)
)
),
Expand Down
24 changes: 12 additions & 12 deletions tests/Eccube/Tests/Repository/CategoryRepositoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ public function setUp()
public function createCategories()
{
$categories = array(
array('name' => '親1', 'level' => 1, 'rank' => 1,
array('name' => '親1', 'hierarchy' => 1, 'rank' => 1,
'child' => array(
array('name' => '子1', 'level' => 2, 'rank' => 4,
array('name' => '子1', 'hierarchy' => 2, 'rank' => 4,
'child' => array(
array('name' => '孫1', 'level' => 3, 'rank' => 9)
array('name' => '孫1', 'hierarchy' => 3, 'rank' => 9)
),
),
),
),
array('name' => '親2', 'level' => 1, 'rank' => 2,
array('name' => '親2', 'hierarchy' => 1, 'rank' => 2,
'child' => array(
array('name' => '子2-0', 'level' => 2, 'rank' => 5,
array('name' => '子2-0', 'hierarchy' => 2, 'rank' => 5,
'child' => array(
array('name' => '孫2', 'level' => 3, 'rank' => 10)
array('name' => '孫2', 'hierarchy' => 3, 'rank' => 10)
)
),
array('name' => '子2-1', 'level' => 2, 'rank' => 6),
array('name' => '子2-2', 'level' => 2, 'rank' => 7)
array('name' => '子2-1', 'hierarchy' => 2, 'rank' => 6),
array('name' => '子2-2', 'hierarchy' => 2, 'rank' => 7)
),
),
array('name' => '親3', 'level' => 1, 'rank' => 3,
array('name' => '親3', 'hierarchy' => 1, 'rank' => 3,
'child' => array(
array('name' => '子3', 'level' => 2, 'rank' => 8,
array('name' => '子3', 'hierarchy' => 2, 'rank' => 8,
'child' => array(
array('name' => '孫3', 'level' => 3, 'rank' => 11)
array('name' => '孫3', 'hierarchy' => 3, 'rank' => 11)
)
)
),
Expand Down Expand Up @@ -186,7 +186,7 @@ public function testSaveWithException()
$name = $faker->name;
$Category = new Category();
$Category->setName($name)
->setHierarchy(null); // level は not null なので例外になる
->setHierarchy(null); // hierarchy は not null なので例外になる
$result = $this->app['eccube.repository.category']->save($Category);
$this->assertFalse($result);
}
Expand Down
22 changes: 11 additions & 11 deletions tests/Eccube/Tests/Web/Admin/Product/CategoryContorllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,31 @@ public function setUp()
public function createCategories()
{
$categories = array(
array('name' => '親1', 'level' => 1, 'rank' => 1,
array('name' => '親1', 'hierarchy' => 1, 'rank' => 1,
'child' => array(
array('name' => '子1', 'level' => 2, 'rank' => 4,
array('name' => '子1', 'hierarchy' => 2, 'rank' => 4,
'child' => array(
array('name' => '孫1', 'level' => 3, 'rank' => 9)
array('name' => '孫1', 'hierarchy' => 3, 'rank' => 9)
),
),
),
),
array('name' => '親2', 'level' => 1, 'rank' => 2,
array('name' => '親2', 'hierarchy' => 1, 'rank' => 2,
'child' => array(
array('name' => '子2-0', 'level' => 2, 'rank' => 5,
array('name' => '子2-0', 'hierarchy' => 2, 'rank' => 5,
'child' => array(
array('name' => '孫2', 'level' => 3, 'rank' => 10)
array('name' => '孫2', 'hierarchy' => 3, 'rank' => 10)
)
),
array('name' => '子2-1', 'level' => 2, 'rank' => 6),
array('name' => '子2-2', 'level' => 2, 'rank' => 7)
array('name' => '子2-1', 'hierarchy' => 2, 'rank' => 6),
array('name' => '子2-2', 'hierarchy' => 2, 'rank' => 7)
),
),
array('name' => '親3', 'level' => 1, 'rank' => 3,
array('name' => '親3', 'hierarchy' => 1, 'rank' => 3,
'child' => array(
array('name' => '子3', 'level' => 2, 'rank' => 8,
array('name' => '子3', 'hierarchy' => 2, 'rank' => 8,
'child' => array(
array('name' => '孫3', 'level' => 3, 'rank' => 11)
array('name' => '孫3', 'hierarchy' => 3, 'rank' => 11)
)
)
),
Expand Down

0 comments on commit efaa253

Please sign in to comment.