diff --git a/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php b/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php index 52c4bbda4..1103f74f7 100644 --- a/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php +++ b/core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php @@ -157,13 +157,15 @@ abstract class AbstractSeoCrudController extends AbstractCrudController /** * Update SEO modification, and either go back to the object list, or stay on the edition page. * - * @return Thelia\Core\HttpFoundation\Response the response + * @return \Thelia\Core\HttpFoundation\Response the response */ public function processUpdateSeoAction() { // Check current user authorization - if (null !== $response = $this->checkAuth($this->resourceCode, array(), AccessManager::UPDATE)) + if (null !== $response = $this->checkAuth($this->resourceCode, array(), AccessManager::UPDATE)) { return $response; + } + // Error (Default: false) $error_msg = false; diff --git a/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php b/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php index 54fb2fdc1..9443ebb55 100644 --- a/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php +++ b/core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php @@ -65,8 +65,7 @@ class ProductDefaultSaleElementUpdateForm extends ProductSaleElementUpdateForm "label_attr" => array("for" => "tax_rule_field") )) ->add("weight", "number", array( - "constraints" => array(new NotBlank()), - "label" => Translator::getInstance()->trans("Weight *"), + "label" => Translator::getInstance()->trans("Weight"), "label_attr" => array("for" => "weight_field") )) ->add("quantity", "number", array( diff --git a/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php b/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php index cda72cc72..1f6516775 100644 --- a/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php +++ b/core/lib/Thelia/Form/ProductSaleElementUpdateForm.php @@ -91,13 +91,10 @@ class ProductSaleElementUpdateForm extends BaseForm )) ->add('weight', 'collection', array( 'type' => 'number', - 'label' => Translator::getInstance()->trans('Weight *'), + 'label' => Translator::getInstance()->trans('Weight'), 'label_attr' => array('for' => 'weight_field'), 'allow_add' => true, - 'allow_delete' => true, - 'options' => array( - 'constraints' => array(new NotBlank()), - ) + 'allow_delete' => true )) ->add('quantity', 'collection', array( 'type' => 'number', diff --git a/templates/backOffice/default/includes/product-prices-tab.html b/templates/backOffice/default/includes/product-prices-tab.html index 32aa42af6..3e93352d7 100644 --- a/templates/backOffice/default/includes/product-prices-tab.html +++ b/templates/backOffice/default/includes/product-prices-tab.html @@ -170,7 +170,7 @@
- + {intl l="Kg"}
@@ -411,7 +411,7 @@ {/form_field} {form_field form=$form field='weight' value_key=$idx} - + {/form_field}