hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-350 Deprecate client

Browse Source
This commit is contained in:
Nicolas Le Goff
2015-01-12 15:10:46 +01:00
committed by Benoît Burnichon
parent 03d3975d87
commit 0007bf58be
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Alchemy/Phrasea/Controller/Client/RootController.php
View File

@@ -13,6 +13,7 @@ use Alchemy\Phrasea\Controller\Controller;
use Alchemy\Phrasea\Security\Firewall; use Alchemy\Phrasea\Security\Firewall;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session;
class RootController extends Controller class RootController extends Controller
{ {
@@ -25,13 +26,27 @@ class RootController extends Controller
} }
/** /**
* Gets client main page * @return Session
*/
private function getSession()
{
return $this->app['session'];
}
/**
* /!\/!\/!\/!\/!\/!\/!\/!\/!\
*
* Client is no longer used
*
* Redirect to production with a nice message
* *
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
public function getClientAction(Request $request) public function getClientAction(Request $request)
{ {
$this->getSession()->getFlashBag()->add('client_deprecated');
if (!$this->getAuthenticator()->isAuthenticated() && null !== $request->query->get('nolog')) { if (!$this->getAuthenticator()->isAuthenticated() && null !== $request->query->get('nolog')) {
return $this->app->redirectPath('login_authenticate_as_guest', ['redirect' => 'client']); return $this->app->redirectPath('login_authenticate_as_guest', ['redirect' => 'client']);
} }

2
templates/web/common/menubar.html.twig
View File

@@ -174,7 +174,7 @@
</div> </div>
</div> </div>
{% if app.getAuthenticator().isAuthenticated() and (module == "client" or module == "prod") %} {% if app.getAuthenticator().isAuthenticated() and module == "prod" %}
<div style="display:none;z-index:30000;" id="notification_box"> <div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = app['events-manager'].get_notifications %} {% set notifications = app['events-manager'].get_notifications %}
{% include 'prod/notifications.html.twig' %} {% include 'prod/notifications.html.twig' %}

1
templates/web/prod/index.html.twig
View File

@@ -185,7 +185,6 @@
$('#clientModal').modal(); $('#clientModal').modal();
</script> </script>
{% endif %} {% endif %}
{% set ratio = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'search_window') %} {% set ratio = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'search_window') %}
{% if ratio == 0 %} {% if ratio == 0 %}
{% set ratio = '0.333' %} {% set ratio = '0.333' %}

9
tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
View File

@@ -1,6 +1,7 @@
<?php <?php
namespace Alchemy\Tests\Phrasea\Controller\Client; namespace Alchemy\Tests\Phrasea\Controller\Client;
use Symfony\Bundle\FrameworkBundle\Client;
/** /**
* @group functional * @group functional
@@ -10,12 +11,12 @@ namespace Alchemy\Tests\Phrasea\Controller\Client;
*/ */
class RootTest extends \PhraseanetAuthenticatedWebTestCase class RootTest extends \PhraseanetAuthenticatedWebTestCase
{ {
protected $client;
public function testGetClient() public function testGetClient()
{ {
$this->authenticate(self::$DI['app']); $this->authenticate(self::$DI['app']);
self::$DI['client']->request("GET", "/client/"); /** @var Client $client */
$this->assertTrue(self::$DI['client']->getResponse()->isRedirect()); $client = self::$DI['client'];
$client->request("GET", "/client/");
$this->assertTrue($client->getResponse()->isRedirect());
} }
} }