Revert "Added missing generateErrorRedirect() calls"

This reverts commit fe03294.
thelia · Jan 8, 2016 · 96c6fa1 · 96c6fa1
1 parent 644ce4e
commit 96c6fa1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/local/modules/Front/Controller/AddressController.php b/local/modules/Front/Controller/AddressController.php
@@ -32,7 +32,6 @@
 use Thelia\Form\AddressUpdateForm;
 use Thelia\Form\Definition\FrontForm;
 use Thelia\Form\Exception\FormValidationException;
-use Thelia\Log\Tlog;
 use Thelia\Model\AddressQuery;
 
 /**
@@ -143,7 +142,7 @@ public function processUpdateAction($address_id)
         $request = $this->getRequest();
 
         $addressUpdate = $this->createForm(FrontForm::ADDRESS_UPDATE);
-
+        $message = false;
         try {
             $customer = $this->getSecurityContext()->getCustomerUser();
 
@@ -170,11 +169,9 @@ public function processUpdateAction($address_id)
         } catch (\Exception $e) {
             $message = $this->getTranslator()->trans("Sorry, an error occured: %s", ['%s' => $e->getMessage()], Front::MESSAGE_DOMAIN);
         }
-
         $this->getParserContext()->set("address_id", $address_id);
-
         if ($message !== false) {
-            Tlog::getInstance()->error(sprintf("Error during address creation process : %s", $message));
+            \Thelia\Log\Tlog::getInstance()->error(sprintf("Error during address creation process : %s", $message));
 
             $addressUpdate->setErrorMessage($message);
 
@@ -183,8 +180,6 @@ public function processUpdateAction($address_id)
                 ->setGeneralError($message)
             ;
         }
-
-        return $this->generateErrorRedirect($addressUpdate);
     }
 
     public function deleteAction($address_id)

diff --git a/local/modules/Front/Controller/CartController.php b/local/modules/Front/Controller/CartController.php
@@ -82,8 +82,6 @@ public function addItem()
             $cartAdd->setErrorMessage($message);
             $this->getParserContext()->addForm($cartAdd);
         }
-
-        return $this->generateErrorRedirect($cartAdd);
     }
 
     public function changeItem()
@@ -106,9 +104,12 @@ public function changeItem()
             } elseif (null !== $response = $this->generateSuccessRedirect()) {
                 return $response;
             }
+
+
         } catch (PropelException $e) {
             $this->getParserContext()->setGeneralError($e->getMessage());
         }
+
     }
 
     public function deleteItem()

diff --git a/local/modules/Front/Controller/CouponController.php b/local/modules/Front/Controller/CouponController.php
@@ -144,7 +144,5 @@ public function consumeAction()
                 ->addForm($couponCodeForm)
                 ->setGeneralError($message);
         }
-
-        return $this->generateErrorRedirect($couponCodeForm);
     }
 }
diff --git a/local/modules/Front/Controller/CustomerController.php b/local/modules/Front/Controller/CustomerController.php
@@ -490,8 +490,6 @@ public function loginAction()
             $customerLoginForm->setErrorMessage($message);
 
             $this->getParserContext()->addForm($customerLoginForm);
-
-            return $this->generateErrorRedirect($customerLoginForm);
         }
     }