TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed customer front controller, events, addec admion config.

Browse Source
This commit is contained in:
franck
2013-08-30 19:46:12 +02:00
parent cce270fdcc
commit 6867eae9b7
35 changed files with 810 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Action/Category.php
View File

@@ -75,7 +75,7 @@ class Category extends BaseAction implements EventSubscriberInterface
{
$this->checkAuth("ADMIN", "admin.category.delete");
$category = CategoryQuery::create()->findPk($event->getId());
$category = CategoryQuery::create()->findPk($event->getCategoryId());
if ($category !== null) {
@@ -98,7 +98,7 @@ class Category extends BaseAction implements EventSubscriberInterface
{
$this->checkAuth("ADMIN", "admin.category.edit");
$category = CategoryQuery::create()->findPk($event->getId());
$category = CategoryQuery::create()->findPk($event->getCategoryId());
if ($category !== null) {
@@ -136,7 +136,7 @@ class Category extends BaseAction implements EventSubscriberInterface
*/
protected function exchangePosition(CategoryChangePositionEvent $event)
{
$category = CategoryQuery::create()->findPk($event->getId());
$category = CategoryQuery::create()->findPk($event->getCategoryId());
if ($category !== null) {
@@ -195,7 +195,7 @@ class Category extends BaseAction implements EventSubscriberInterface
{
$this->checkAuth("ADMIN", "admin.category.edit");
$category = CategoryQuery::create()->findPk($event->getId());
$category = CategoryQuery::create()->findPk($event->getCategoryId());
if ($category !== null) {

15
core/lib/Thelia/Action/Customer.php
View File

@@ -38,6 +38,7 @@ use Symfony\Component\Validator\Exception\ValidatorException;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\UsernameNotFoundException;
use Propel\Runtime\Exception\PropelException;
use Thelia\Core\Event\CustomerLoginEvent;
class Customer extends BaseAction implements EventSubscriberInterface
{
@@ -46,7 +47,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
{
$customer = new CustomerModel();
$customer->setDispatcher($this->getDispatcher());
$this->createOrUpdateCustomer($customer, $event);
@@ -56,7 +56,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
{
$customer = $event->getCustomer();
$customer->setDispatcher($this->getDispatcher());
$this->createOrUpdateCustomer($customer, $event);
@@ -64,6 +63,8 @@ class Customer extends BaseAction implements EventSubscriberInterface
private function createOrUpdateCustomer(CustomerModel $customer, CustomerCreateOrUpdateEvent $event)
{
$customer->setDispatcher($this->getDispatcher());
$customer->createOrUpdate(
$event->getTitle(),
$event->getFirstname(),
@@ -87,6 +88,12 @@ class Customer extends BaseAction implements EventSubscriberInterface
$event->setCustomer($customer);
}
public function login(CustomerLoginEvent $event)
{
$this->getSecurityContext()->setCustomerUser($event->getCustomer());
}
/**
* Perform user logout. The user is redirected to the provided view, if any.
*
@@ -94,8 +101,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
*/
public function logout(ActionEvent $event)
{
$event->getDispatcher()->dispatch(TheliaEvents::CUSTOMER_LOGOUT, $event);
$this->getSecurityContext()->clearCustomerUser();
}
@@ -129,6 +134,8 @@ class Customer extends BaseAction implements EventSubscriberInterface
return array(
TheliaEvents::CUSTOMER_CREATEACCOUNT => array("create", 128),
TheliaEvents::CUSTOMER_UPDATEACCOUNT => array("modify", 128),
TheliaEvents::CUSTOMER_LOGOUT => array("logout", 128),
TheliaEvents::CUSTOMER_LOGIN => array("login" , 128),
);
}
}