Skip to content

Commit fae6f5b

Browse files
User management added. Client management refactored.
1 parent dc1b139 commit fae6f5b

23 files changed

+917
-143
lines changed

app/Resources/views/nav_bootstrap.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ 'action.admin_menu'|trans }}<span class="caret"></span></a>
4141
<ul class="dropdown-menu locales" role="menu" aria-labelledby="locales">
4242
<li><a href="#">{{ 'action.role_management'|trans }}</a></li>
43-
<li><a href="#">{{ 'action.user_management'|trans }}</a></li>
43+
<li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
4444
<li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
45-
<li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
4645
</ul>
4746
</li>
4847
{% endif %}

app/Resources/views/nav_materialize.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
<a href="#">{{ 'action.admin_menu'|trans }}<span></span></a>
3333
<ul>
3434
<li><a href="#">{{ 'action.role_management'|trans }}</a></li>
35-
<li><a href="#">{{ 'action.user_management'|trans }}</a></li>
35+
<li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
3636
<li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
37-
<li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
3837
</ul>
3938
</li>
4039
{% endif %}

app/Resources/views/nav_skeleton.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
<a href="#">{{ 'action.admin_menu'|trans }}<span></span></a>
3333
<ul>
3434
<li><a href="#">{{ 'action.role_management'|trans }}</a></li>
35-
<li><a href="#">{{ 'action.user_management'|trans }}</a></li>
35+
<li><a href="{{ path('admin_user_index') }}">{{ 'action.user_management'|trans }}</a></li>
3636
<li><a href="{{ path('admin_client_index') }}">{{ 'action.client_management'|trans }}</a></li>
37-
<li><a href="{{ path('admin_client_new') }}">{{ 'action.create_new_client'|trans }}</a></li>
3837
</ul>
3938
</li>
4039
{% endif %}

app/config/routing.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ fos_user_change_password:
4646
resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
4747
prefix: /{_locale}/profile
4848

49-
users:
50-
resource: "@ApiBundle/Resources/config/user_routes.yml"
51-
type: rest
52-
prefix: /api
53-
methods: GET|POST
49+
# users:
50+
# resource: "@ApiBundle/Resources/config/user_routes.yml"
51+
# type: rest
52+
# prefix: /api
53+
# methods: GET|POST
5454

5555
NelmioApiDocBundle:
5656
resource: "@NelmioApiDocBundle/Resources/config/routing.yml"

src/ApiBundle/Controller/Admin/ClientController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace ApiBundle\Controller\Admin;
44

55
use ApiBundle\Entity\Client;
6-
use ApiBundle\Form\ClientType;
6+
77
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
88
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
99
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -60,7 +60,6 @@ public function newAction(Request $request)
6060
->add('name', 'text', array('label' => 'label.client_name', 'data' => $clientName ))
6161
->add('redirect_url', 'text', array('label' => 'label.admin_redirecturl', 'data' => $redirectUrl ))
6262
->add('password', 'password', array('label' => 'label.admin_password' ))
63-
->add('send', 'submit', array('label' => 'label.create_client' ))
6463
->getForm();
6564
$form->handleRequest($request);
6665

0 commit comments

Comments
 (0)