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

Refactored VariableXxxxx.php as ConfigXxxx.php

Browse Source
This commit is contained in:
franck
2013-09-02 01:37:12 +02:00
parent 1558f6af5f
commit beab17a18d
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -47,8 +47,8 @@
<form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>
<form name="thelia.admin.variable.creation" class="Thelia\Form\VariableCreationForm"/>
<form name="thelia.admin.variable.modification" class="Thelia\Form\VariableModificationForm"/>
<form name="thelia.admin.config.creation" class="Thelia\Form\ConfigCreationForm"/>
<form name="thelia.admin.config.modification" class="Thelia\Form\ConfigModificationForm"/>
</forms>

12
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -38,27 +38,27 @@
<!-- Routes to the Config (system variables) controller -->
<route id="admin.configuration.variables.default" path="/admin/configuration/variables">
<default key="_controller">Thelia\Controller\Admin\VariablesController::defaultAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::defaultAction</default>
</route>
<route id="admin.configuration.variables.change-values" path="/admin/configuration/variables/change-values">
<default key="_controller">Thelia\Controller\Admin\VariablesController::changeValuesAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::changeValuesAction</default>
</route>
<route id="admin.configuration.variables.create" path="/admin/configuration/variables/create">
<default key="_controller">Thelia\Controller\Admin\VariablesController::createAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::createAction</default>
</route>
<route id="admin.configuration.variables.change" path="/admin/configuration/variables/change">
<default key="_controller">Thelia\Controller\Admin\VariablesController::changeAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::changeAction</default>
</route>
<route id="admin.configuration.variables.save-change" path="/admin/configuration/variables/save-change">
<default key="_controller">Thelia\Controller\Admin\VariablesController::saveChangeAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::saveChangeAction</default>
</route>
<route id="admin.configuration.variables.delete" path="/admin/configuration/variables/delete">
<default key="_controller">Thelia\Controller\Admin\VariablesController::deleteAction</default>
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>

12
core/lib/Thelia/Controller/Admin/VariablesController.php → core/lib/Thelia/Controller/Admin/ConfigController.php
View File

@@ -27,20 +27,20 @@ use Thelia\Core\Event\ConfigDeleteEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Tools\URL;
use Thelia\Core\Event\ConfigChangeEvent;
use Thelia\Form\VariableCreationForm;
use Thelia\Core\Event\ConfigCreateEvent;
use Thelia\Log\Tlog;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Security\Exception\AuthorizationException;
use Thelia\Form\VariableModificationForm;
use Thelia\Model\ConfigQuery;
use Thelia\Form\ConfigModificationForm;
use Thelia\Form\ConfigCreationForm;
/**
* Manages Thelmia system variables, aka Config objects.
*
* @author Franck Allimant <franck@cqfdev.fr>
*/
class VariablesController extends BaseAdminController
class ConfigController extends BaseAdminController
{
/**
* The default action is displaying the variables list.
@@ -67,7 +67,7 @@ class VariablesController extends BaseAdminController
$message = false;
// Create the Creation Form
$creationForm = new VariableCreationForm($this->getRequest());
$creationForm = new ConfigCreationForm($this->getRequest());
try {
@@ -159,7 +159,7 @@ class VariablesController extends BaseAdminController
);
// Setup the object form
$changeForm = new VariableModificationForm($this->getRequest(), "form", $data);
$changeForm = new ConfigModificationForm($this->getRequest(), "form", $data);
// Pass it to the parser
$this->getParserContext()->addForm($changeForm);
@@ -182,7 +182,7 @@ class VariablesController extends BaseAdminController
$message = false;
// Create the form from the request
$changeForm = new VariableModificationForm($this->getRequest());
$changeForm = new ConfigModificationForm($this->getRequest());
// Get the variable ID
$variable_id = $this->getRequest()->get('variable_id');

4
core/lib/Thelia/Form/VariableCreationForm.php → core/lib/Thelia/Form/ConfigCreationForm.php
View File

@@ -26,7 +26,7 @@ use Symfony\Component\Validator\Constraints;
use Thelia\Model\ConfigQuery;
use Symfony\Component\Validator\ExecutionContextInterface;
class VariableCreationForm extends BaseForm
class ConfigCreationForm extends BaseForm
{
protected function buildForm($change_mode = false)
{
@@ -60,7 +60,7 @@ class VariableCreationForm extends BaseForm
public function getName()
{
return "thelia_variable_creation";
return "thelia_config_creation";
}
public function checkDuplicateName($value, ExecutionContextInterface $context)

4
core/lib/Thelia/Form/VariableModificationForm.php → core/lib/Thelia/Form/ConfigModificationForm.php
View File

@@ -27,7 +27,7 @@ use Thelia\Model\LangQuery;
use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\Validator\Constraints\GreaterThan;
class VariableModificationForm extends BaseDescForm
class ConfigModificationForm extends BaseDescForm
{
protected function buildForm()
{
@@ -54,6 +54,6 @@ class VariableModificationForm extends BaseDescForm
public function getName()
{
return "thelia_variable_modification";
return "thelia_config_modification";
}
}

2
templates/admin/default/variable-edit.html
View File

@@ -29,7 +29,7 @@
<div class="form-horizontal span12">
<fieldset>
{form name="thelia.admin.variable.modification"}
{form name="thelia.admin.config.modification"}
<form method="POST" action="{url path='/admin/configuration/variables/save-change'}" {form_enctype form=$form}>
{* Be sure to get the variable ID, even if the form could not be validated *}

4
templates/admin/default/variables.html
View File

@@ -95,7 +95,7 @@
<h3>{intl l="Create a new variable"}</h3>
</div>
{form name="thelia.admin.variable.creation"}
{form name="thelia.admin.config.creation"}
<form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
{form_hidden_fields form=$form}
@@ -221,7 +221,7 @@
{* display the form creation dialog if it contains errors *}
{form name="thelia.admin.variable.creation"}
{form name="thelia.admin.config.creation"}
{if #form_error}
$('#add_variable_dialog').modal();
{/if}