Skip to content

Commit 70bd330

Browse files
artemdigiartemdigi
committed
refactoring
1 parent dcfd15d commit 70bd330

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

‎Controller/AdminController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function indexAction(Request $request)
2929
}
3030

3131
return $this->render('@MenuModule/Admin/index.html.twig', [
32-
'menus' => $this->get('doctrine.orm.default_entity_manager')->getRepository('MenuModule:Menu')->findAll(),
32+
'menus' => $this->get('doctrine.orm.default_entity_manager')->getRepository('MenuModuleBundle:Menu')->findAll(),
3333
'form' => $form->createView(),
3434
]);
3535
}
@@ -45,7 +45,7 @@ public function indexAction(Request $request)
4545
public function itemAction(Request $request, $item_id)
4646
{
4747
/** @var Item $item */
48-
$item = $this->get('doctrine.orm.default_entity_manager')->find('MenuModule:Item', $item_id);
48+
$item = $this->get('doctrine.orm.default_entity_manager')->find('MenuModuleBundle:Item', $item_id);
4949

5050
$form = $this->createForm(ItemFormType::class, $item);
5151

@@ -87,7 +87,7 @@ public function itemAction(Request $request, $item_id)
8787
*/
8888
public function menuEditAction(Request $request, $menu_id)
8989
{
90-
$menu = $this->get('doctrine.orm.default_entity_manager')->find('MenuModule:Menu', $menu_id);
90+
$menu = $this->get('doctrine.orm.default_entity_manager')->find('MenuModuleBundle:Menu', $menu_id);
9191

9292
if (empty($menu)) {
9393
return $this->redirectToRoute('smart_module.menu.admin');
@@ -133,7 +133,7 @@ public function menuEditAction(Request $request, $menu_id)
133133
*/
134134
public function menuAction(Request $request, $menu_id)
135135
{
136-
$menu = $this->get('doctrine.orm.default_entity_manager')->find('MenuModule:Menu', $menu_id);
136+
$menu = $this->get('doctrine.orm.default_entity_manager')->find('MenuModuleBundle:Menu', $menu_id);
137137

138138
if (empty($menu)) {
139139
return $this->redirectToRoute('smart_module.menu.admin');

‎Controller/MenuController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function indexAction(Request $request)
2525
'css_class' => $this->css_class,
2626
'current_class' => $this->current_class,
2727
'depth' => $this->depth,
28-
'menu' => $em->find('MenuModule:Menu', $this->menu_id),
28+
'menu' => $em->find('MenuModuleBundle:Menu', $this->menu_id),
2929
]);
3030

3131
//$menu = $this->get('html.tidy')->prettifyFragment($menu);

‎DependencyInjection/Compiler/FormPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function process(ContainerBuilder $container)
1111
{
1212
$resources = $container->getParameter('twig.form.resources');
1313

14-
$resources[] = 'MenuModule:Form:fields.html.twig';
14+
$resources[] = 'MenuModuleBundle:Form:fields.html.twig';
1515

1616
$container->setParameter('twig.form.resources', $resources);
1717
}

‎Form/Tree/ItemTreeType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function configureOptions(OptionsResolver $resolver)
5151

5252
$resolver->setDefaults([
5353
'choice_label' => 'form_title',
54-
'class' => 'MenuModule:Item',
54+
'class' => 'MenuModuleBundle:Item',
5555
'choice_loader' => $choiceLoader,
5656
'menu' => null,
5757
'required' => false,

‎Form/Type/NodePropertiesFormType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
1818
->add('css_class', TextType::class, ['required' => false])
1919
->add('current_class', TextType::class, ['required' => false])
2020
->add('selected_inheritance', CheckboxType::class, ['required' => false])
21-
->add('menu_id', ChoiceType::class, ['choices' => $this->getChoicesByEntity('MenuModule:Menu')])
21+
->add('menu_id', ChoiceType::class, ['choices' => $this->getChoicesByEntity('MenuModuleBundle:Menu')])
2222
;
2323
}
2424

‎Menu/MenuBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected function processConfig(array $options)
101101
protected function addChild(ItemInterface $menu, Item $parent_item = null)
102102
{
103103
$items = (null == $parent_item)
104-
? $this->em->getRepository('MenuModule:Item')->findByParent($this->menu, null)
104+
? $this->em->getRepository('MenuModuleBundle:Item')->findByParent($this->menu, null)
105105
: $parent_item->getChildren();
106106

107107
/** @var Item $item */

‎MenuModule.php renamed to ‎MenuModuleBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use SmartCore\Module\Menu\DependencyInjection\Compiler\FormPass;
77
use Symfony\Component\DependencyInjection\ContainerBuilder;
88

9-
class MenuModule extends ModuleBundle
9+
class MenuModuleBundle extends ModuleBundle
1010
{
1111
protected $adminMenuBeforeCode = '<i class="fa fa-indent"></i>';
1212

@@ -19,7 +19,7 @@ public function getDashboard()
1919
{
2020
$em = $this->container->get('doctrine.orm.default_entity_manager');
2121
$r = $this->container->get('router');
22-
$menus = $em->getRepository('MenuModule:Menu')->findAll();
22+
$menus = $em->getRepository('MenuModuleBundle:Menu')->findAll();
2323

2424
$data = [
2525
'title' => 'Меню',

‎Resources/config/routing_admin.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
smart_module.menu.admin:
33
path: /
44
defaults:
5-
_controller: MenuModule:Admin:index
5+
_controller: MenuModuleBundle:Admin:index
66

77
smart_module.menu.admin_menu:
88
path: /{menu_id}
99
defaults:
10-
_controller: MenuModule:Admin:menu
10+
_controller: MenuModuleBundle:Admin:menu
1111
requirements:
1212
menu_id: \d+
1313

1414
smart_module.menu.admin_menu_edit:
1515
path: /{menu_id}/edit
1616
defaults:
17-
_controller: MenuModule:Admin:menuEdit
17+
_controller: MenuModuleBundle:Admin:menuEdit
1818
requirements:
1919
menu_id: \d+
2020

2121
smart_module.menu.admin_item:
2222
path: /item/{item_id}
2323
defaults:
24-
_controller: MenuModule:Admin:item
24+
_controller: MenuModuleBundle:Admin:item
2525
requirements:
2626
item_id: \d+

‎Resources/views/Admin/menu.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="col-md-6">
1717
<h3>Пункты меню &laquo;{{ menu.name }}&raquo;</h3>
1818

19-
{% set menuItems = knp_menu_get('MenuModule:MenuBuilder:full', [], {
19+
{% set menuItems = knp_menu_get('MenuModuleBundle:MenuBuilder:full', [], {
2020
'menu': menu,
2121
'is_admin': true,
2222
}) %}

‎Resources/views/menu.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% set current_class = 'current' %}
77
{% endif %}
88

9-
{% set menuItems = knp_menu_get('MenuModule:MenuBuilder:full', [], {
9+
{% set menuItems = knp_menu_get('MenuModuleBundle:MenuBuilder:full', [], {
1010
'menu': menu,
1111
'css_class': css_class,
1212
'depth': depth,

0 commit comments

Comments
 (0)