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

Merge branch 'master' into template

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-17 20:14:17 +02:00
parent 03375a65b3 e1e383707b
commit 5ffb737c50
37 changed files with 1550 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Form/CategoryCreationForm.php
View File

@@ -53,7 +53,7 @@ class CategoryCreationForm extends BaseForm
"label_attr" => array("for" => "locale_create")
))
->add("visible", "integer", array(
"label" => Translator::getInstance()->trans("This category is online on the front office."),
"label" => Translator::getInstance()->trans("This category is online."),
"label_attr" => array("for" => "visible_create")
))
;

8
core/lib/Thelia/Form/ProductCreationForm.php
View File

@@ -47,7 +47,7 @@ class ProductCreationForm extends BaseForm
"for" => "title"
)
))
->add("parent", "integer", array(
->add("default_category", "integer", array(
"constraints" => array(
new NotBlank()
)
@@ -57,7 +57,11 @@ class ProductCreationForm extends BaseForm
new NotBlank()
)
))
;
->add("visible", "integer", array(
"label" => Translator::getInstance()->trans("This product is online."),
"label_attr" => array("for" => "visible_create")
))
;
}
public function getName()

64
core/lib/Thelia/Form/ProductModificationForm.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Form;
use Symfony\Component\Validator\Constraints\GreaterThan;
use Thelia\Core\Translation\Translator;
use Symfony\Component\Validator\Constraints\NotBlank;
class ProductModificationForm extends ProductCreationForm
{
use StandardDescriptionFieldsTrait;
protected function buildForm()
{
parent::buildForm(true);
$this->formBuilder
->add("id", "integer", array(
"label" => Translator::getInstance()->trans("Prodcut ID *"),
"label_attr" => array("for" => "product_id_field"),
"constraints" => array(new GreaterThan(array('value' => 0)))
))
->add("template_id", "integer", array(
"label" => Translator::getInstance()->trans("Product template"),
"label_attr" => array("for" => "product_template_field")
))
->add("url", "text", array(
"label" => Translator::getInstance()->trans("Rewriten URL *"),
"constraints" => array(new NotBlank()),
"label_attr" => array("for" => "rewriten_url_field")
))
;
// Add standard description fields, excluding title and locale, which a re defined in parent class
$this->addStandardDescFields(array('title', 'locale'));
}
public function getName()
{
return "thelia_product_modification";
}
}