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

Remove inline redirection

Browse Source
This commit is contained in:
Romain Neutron
2012-07-24 19:13:21 +02:00
parent 5f25c7b190
commit a9bdeefcde
5 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
View File

@@ -119,7 +119,7 @@ class Subdefs implements ControllerProviderInterface
}
}
return new RedirectResponse('/admin/subdefs/' . $databox->get_sbas_id() . '/');
return $app->redirect('/admin/subdefs/' . $databox->get_sbas_id() . '/');
})->assert('sbas_id', '\d+');
return $controllers;

2
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -211,7 +211,7 @@ class Users implements ControllerProviderInterface
$users->apply_template();
return new RedirectResponse('/admin/users/search/');
return $app->redirect('/admin/users/search/');
}
);

152
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -11,16 +11,17 @@
namespace Alchemy\Phrasea\Controller\Prod;
use Silex\Application,
Silex\ControllerProviderInterface,
Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request,
Symfony\Component\HttpFoundation\Response,
Symfony\Component\HttpFoundation\RedirectResponse,
Symfony\Component\HttpKernel\Exception\HttpException,
Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\RouteProcessor\Basket as BasketRoute,
Alchemy\Phrasea\Helper;
use Alchemy\Phrasea\Helper\Record\Basket;
use Silex\Application;
use Silex\ControllerProviderInterface;
use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\RouteProcessor\Basket as BasketRoute;
use Alchemy\Phrasea\Helper;
/**
*
@@ -44,59 +45,7 @@ class Basket implements ControllerProviderInterface
* @accept JSON / YAML
*
*/
$controllers->post('/', function(Application $app) {
$request = $app['request'];
/* @var $request \Symfony\Component\HttpFoundation\Request */
$em = $app['phraseanet.core']->getEntityManager();
$user = $app['phraseanet.core']->getAuthenticatedUser();
$Basket = new \Entities\Basket();
$Basket->setName($request->get('name', ''));
$Basket->setOwner($app['phraseanet.core']->getAuthenticatedUser());
$Basket->setDescription($request->get('desc'));
$em->persist($Basket);
$n = 0;
$helper = new \Alchemy\Phrasea\Helper\Record\Basket($app['phraseanet.core'], $app['request']);
foreach ($helper->get_elements() as $record) {
if ($Basket->hasRecord($record))
continue;
$basket_element = new \Entities\BasketElement();
$basket_element->setRecord($record);
$basket_element->setBasket($Basket);
$em->persist($basket_element);
$Basket->addBasketElement($basket_element);
$n ++;
}
$em->flush();
if ($request->getRequestFormat() == 'json') {
$data = array(
'success' => true
, 'message' => _('Basket created')
, 'basket' => array(
'id' => $Basket->getId()
)
);
return $app->json($data);
} else {
return new RedirectResponse(sprintf('/%d/', $Basket->getId()));
}
});
$controllers->post('/', $this->call('createBasket'));
/**
* This route is used to delete a basket
@@ -121,7 +70,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+');
@@ -154,7 +103,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+')->assert('basket_element_id', '\d+');
@@ -199,7 +148,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+');
@@ -307,7 +256,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+');
@@ -327,7 +276,7 @@ class Basket implements ControllerProviderInterface
$n = 0;
$helper = new \Alchemy\Phrasea\Helper\Record\Basket($app['phraseanet.core'], $app['request']);
$helper = new Basket($app['phraseanet.core'], $app['request']);
foreach ($helper->get_elements() as $record) {
if ($basket->hasRecord($record))
@@ -367,7 +316,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+');
@@ -415,7 +364,7 @@ class Basket implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('basket_id', '\d+');
@@ -460,4 +409,67 @@ class Basket implements ControllerProviderInterface
return $controllers;
}
public function createBasket(Application $app)
{
$request = $app['request'];
/* @var $request \Symfony\Component\HttpFoundation\Request */
$em = $app['phraseanet.core']->getEntityManager();
$Basket = new \Entities\Basket();
$Basket->setName($request->get('name', ''));
$Basket->setOwner($app['phraseanet.core']->getAuthenticatedUser());
$Basket->setDescription($request->get('desc'));
$em->persist($Basket);
$n = 0;
$helper = new Basket($app['phraseanet.core'], $app['request']);
foreach ($helper->get_elements() as $record) {
if ($Basket->hasRecord($record))
continue;
$basket_element = new \Entities\BasketElement();
$basket_element->setRecord($record);
$basket_element->setBasket($Basket);
$em->persist($basket_element);
$Basket->addBasketElement($basket_element);
$n ++;
}
$em->flush();
if ($request->getRequestFormat() == 'json') {
$data = array(
'success' => true
, 'message' => _('Basket created')
, 'basket' => array(
'id' => $Basket->getId()
)
);
return $app->json($data);
} else {
return $app->redirect(sprintf('/%d/', $Basket->getId()));
}
}
/**
* Prefix the method to call with the controller class name
*
* @param string $method The method to call
* @return string
*/
private function call($method)
{
return sprintf('%s::%s', __CLASS__, $method);
}
}

6
lib/Alchemy/Phrasea/Controller/Prod/Story.php
View File

@@ -116,7 +116,7 @@ class Story implements ControllerProviderInterface
return $app->json($data);
} else {
return new RedirectResponse(sprintf('/%d/', $StoryWZ->getId()));
return $app->redirect(sprintf('/%d/', $StoryWZ->getId()));
}
});
@@ -172,7 +172,7 @@ class Story implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('sbas_id', '\d+')->assert('record_id', '\d+');
@@ -200,7 +200,7 @@ class Story implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})
->assert('sbas_id', '\d+')

2
lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
View File

@@ -220,7 +220,7 @@ class WorkZone implements ControllerProviderInterface
if ($request->getRequestFormat() == 'json') {
return $app->json($data);
} else {
return new RedirectResponse('/');
return $app->redirect('/');
}
})->assert('sbas_id', '\d+')->assert('record_id', '\d+');