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

Added name duplication check when creating a variable

Browse Source
This commit is contained in:
franck
2013-09-02 01:25:11 +02:00
parent 928bf7b638
commit 1558f6af5f
10 changed files with 169 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/lib/Thelia/Action/Config.php
View File

@@ -53,6 +53,8 @@ class Config extends BaseAction implements EventSubscriberInterface
->setValue($event->getValue())
->setLocale($event->getLocale())
->setTitle($event->getTitle())
->setHidden($event->getHidden())
->setSecured($event->getSecured())
->save()
;
@@ -69,18 +71,19 @@ class Config extends BaseAction implements EventSubscriberInterface
{
$search = ConfigQuery::create();
if (null !== $config = $search->findOneById($event->getConfigId())
&&
$event->getValue() != $config->getValue()) {
if (null !== $config = $search->findOneById($event->getConfigId())) {
$config
->setDispatcher($this->getDispatcher())
if ($event->getValue() !== $config->getValue()) {
->setValue($event->getValue())
->save()
;
$config
->setDispatcher($this->getDispatcher())
$event->setConfig($config);
->setValue($event->getValue())
->save()
;
$event->setConfig($config);
}
}
}
@@ -122,6 +125,7 @@ class Config extends BaseAction implements EventSubscriberInterface
*/
public function delete(ConfigDeleteEvent $event)
{
if (null !== ($config = ConfigQuery::create()->findOneById($event->getConfigId()))) {
if (! $config->getSecured()) {

6
core/lib/Thelia/Controller/Admin/VariablesController.php
View File

@@ -83,7 +83,9 @@ class VariablesController extends BaseAdminController
->setValue($data['value'])
->setLocale($data["locale"])
->setTitle($data['title'])
;
->setHidden($data['hidden'])
->setSecured($data['secured'])
;
$this->dispatch(TheliaEvents::CONFIG_CREATE, $createEvent);
@@ -288,7 +290,7 @@ class VariablesController extends BaseAdminController
if (null !== $response = $this->checkAuth("admin.configuration.variables.delete")) return $response;
// Get the config id, and dispatch the delet request
$event = new ConfigDeleteEvent($this->getRequest()->get('id'));
$event = new ConfigDeleteEvent($this->getRequest()->get('variable_id'));
$this->dispatch(TheliaEvents::CONFIG_DELETE, $event);

31
core/lib/Thelia/Controller/BaseController.php
View File

@@ -120,6 +120,29 @@ class BaseController extends ContainerAware
return $request->getSession();
}
/**
* Get all errors that occured in a form
*
* @param \Symfony\Component\Form\Form $form
* @return string the error string
*/
private function getErrorMessages(\Symfony\Component\Form\Form $form) {
$errors = '';
foreach ($form->getErrors() as $key => $error) {
$errors .= $error->getMessage() . ', ';
}
foreach ($form->all() as $child) {
if (!$child->isValid()) {
$errors .= $this->getErrorMessages($child) . ', ';
}
}
return rtrim($errors, ', ');
}
/**
* Validate a BaseForm
*
@@ -138,10 +161,12 @@ class BaseController extends ContainerAware
if ($form->isValid()) {
return $form;
} else {
throw new FormValidationException("Missing or invalid data");
}
} else {
else {
throw new FormValidationException(sprintf("Missing or invalid data: %s", $this->getErrorMessages($form)));
}
}
else {
throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod));
}
}

26
core/lib/Thelia/Core/Event/ConfigChangeEvent.php
View File

@@ -29,8 +29,6 @@ class ConfigChangeEvent extends ConfigCreateEvent
{
protected $config_id;
protected $hidden;
protected $secured;
protected $description;
protected $chapo;
protected $postscriptum;
@@ -52,30 +50,6 @@ class ConfigChangeEvent extends ConfigCreateEvent
return $this;
}
public function getHidden()
{
return $this->hidden;
}
public function setHidden($hidden)
{
$this->hidden = $hidden;
return $this;
}
public function getSecured()
{
return $this->secured;
}
public function setSecured($secured)
{
$this->secured = $secured;
return $this;
}
public function getDescription()
{
return $this->description;

26
core/lib/Thelia/Core/Event/ConfigCreateEvent.php
View File

@@ -30,6 +30,8 @@ class ConfigCreateEvent extends ConfigEvent
protected $value;
protected $locale;
protected $title;
protected $hidden;
protected $secured;
// Use event_name to prevent conflict with Event::name property.
public function getEventName()
@@ -79,4 +81,28 @@ class ConfigCreateEvent extends ConfigEvent
return $this;
}
public function getHidden()
{
return $this->hidden;
}
public function setHidden($hidden)
{
$this->hidden = $hidden;
return $this;
}
public function getSecured()
{
return $this->secured;
}
public function setSecured($secured)
{
$this->secured = $secured;
return $this;
}
}

14
core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
View File

@@ -27,8 +27,22 @@ use Thelia\Model\Config;
class ConfigDeleteEvent extends ConfigEvent
{
protected $config_id;
public function __construct($config_id)
{
$this->setConfigId($config_id);
}
public function getConfigId()
{
return $this->config_id;
}
public function setConfigId($config_id)
{
$this->config_id = $config_id;
return $this;
}
}

36
core/lib/Thelia/Form/VariableCreationForm.php
View File

@@ -22,31 +22,39 @@
/*************************************************************************************/
namespace Thelia\Form;
use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Model\LangQuery;
use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\Validator\Constraints;
use Thelia\Model\ConfigQuery;
use Symfony\Component\Validator\ExecutionContextInterface;
class VariableCreationForm extends BaseForm
{
protected function buildForm()
protected function buildForm($change_mode = false)
{
$name_constraints = array(new Constraints\NotBlank());
if (!$change_mode) {
$name_constraints[] = new Constraints\Callback(array(
"methods" => array(array($this, "checkDuplicateName"))
));
}
$this->formBuilder
->add("name", "text", array(
"constraints" => array(
new NotBlank()
)
"constraints" => $name_constraints
))
->add("title", "text", array(
"constraints" => array(
new NotBlank()
new Constraints\NotBlank()
)
))
->add("locale", "hidden", array(
"constraints" => array(
new NotBlank()
new Constraints\NotBlank()
)
))
->add("value", "text", array())
->add("hidden", "hidden", array())
->add("secured", "hidden", array())
;
}
@@ -54,4 +62,14 @@ class VariableCreationForm extends BaseForm
{
return "thelia_variable_creation";
}
public function checkDuplicateName($value, ExecutionContextInterface $context)
{
$config = ConfigQuery::create()->findOneByName($value);
if ($config) {
$context->addViolation(sprintf("A variable with name \"%s\" already exists.", $value));
}
}
}

6
core/lib/Thelia/Form/VariableModificationForm.php
View File

@@ -31,7 +31,7 @@ class VariableModificationForm extends BaseDescForm
{
protected function buildForm()
{
parent::buildForm();
parent::buildForm(true);
$this->formBuilder
->add("id", "hidden", array(
@@ -49,11 +49,11 @@ class VariableModificationForm extends BaseDescForm
->add("value", "text", array())
->add("hidden", "hidden", array())
->add("secured", "hidden", array())
;
;
}
public function getName()
{
return "thelia_variable_creation";
return "thelia_variable_modification";
}
}

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

@@ -1,4 +1,4 @@
{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.edit" login_tpl="admin/login"}
{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.edit" login_tpl="/admin/login"}
{$page_title={intl l='Edit a system variable'}}
@@ -11,9 +11,9 @@
{loop name="config_edit" type="config" hidden="*" id="$variable_id" backend_context="1" lang="$edition_language"}
<ul class="breadcrumb">
<li><a href="{url path='admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li>
<li><a href="{url path='admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li>
<li><a href="{url path='admin/configuration/variables'}">{intl l="System variables"}</a> <span class="divider">/</span></li>
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li>
<li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a> <span class="divider">/</span></li>
<li>{intl l='Editing variable "%name"' name="{$NAME}"}</li>
</ul>
@@ -30,7 +30,7 @@
<fieldset>
{form name="thelia.admin.variable.modification"}
<form method="POST" action="{url path='admin/configuration/variables/save-change'}" {form_enctype form=$form}>
<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 *}
<input type="hidden" name="variable_id" value="{$variable_id}" />
@@ -40,7 +40,7 @@
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path='admin/configuration/variables'}" />
<input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables'}" />
{/form_field}
{* We do not allow creation of hidden variables *}
@@ -50,7 +50,7 @@
{/form_field}
{form_field form=$form field='hidden'}
<input type="hidden" name="{$name}" value="0" />
<input type="hidden" name="{$name}" value="{$value}" />
{/form_field}
{form_field form=$form field='locale'}
@@ -94,7 +94,7 @@
</label>
<div class="controls">
{form_field form=$form field='value'}
{form_field form=$form field='secured'}
<span {if $error}class="error"{/if}>
<label class="checkbox">
<input type="checkbox" name="{$name}" value="1" {if $value == 1}checked="checked"{/if}>

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

@@ -1,4 +1,4 @@
{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.view" login_tpl="admin/login"}
{check_auth context="admin" roles="ADMIN" permissions="admin.configuration.variables.view" login_tpl="/admin/login"}
{$page_title={intl l='Thelia System Variables'}}
@@ -9,8 +9,8 @@
<div id="wrapper" class="container">
<ul class="breadcrumb">
<li><a href="{url path='admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li>
<li><a href="{url path='admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li>
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li>
<li>{intl l="System variables"}</li>
</ul>
@@ -21,7 +21,7 @@
<div class="row-fluid">
<div class="span12">
<form action="{url path='admin/configuration/variables/change-values'}" method="post">
<form action="{url path='/admin/configuration/variables/change-values'}" method="post">
<div class="general-block-decorator">
<table class="table table-striped table-condensed table-left-aligned">
<caption>
@@ -60,14 +60,14 @@
<td class="actions">
{if ! $SECURED}
<div class="btn-group">
<a class="btn btn-mini cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="icon-remove-circle"></i></a>
<a class="btn btn-mini cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="icon-remove"></i></a>
{loop type="auth" name="can_change" context="admin" roles="ADMIN" permissions="admin.configuration.variables.change"}
<a class="btn btn-mini config-change" title="{intl l='Change this variable'}" href="{url path='admin/configuration/variables/change' variable_id="$ID"}"><i class="icon-edit"></i></a>
<a class="btn btn-mini config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/change' variable_id="$ID"}"><i class="icon-edit"></i></a>
{/loop}
{loop type="auth" name="can_delete" context="admin" roles="ADMIN" permissions="admin.configuration.variables.delete"}
<a class="btn btn-mini config-delete" title="{intl l='Delete this configuration variable'}" href="{url path='admin/configuration/variables/delete' id="$ID"}"><i class="icon-trash"></i></a>
<a class="btn btn-mini config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="icon-trash"></i></a>
{/loop}
</div>
{/if}
@@ -96,13 +96,23 @@
</div>
{form name="thelia.admin.variable.creation"}
<form method="POST" action="{url path='admin/configuration/variables/create'}" {form_enctype form=$form}>
<form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
{form_hidden_fields form=$form}
{form_field form=$form field='success_url'}
{* on success, redirect to the edition page, _ID_ is replaced with the created variable ID, see controller *}
<input type="hidden" name="{$name}" value="{url path='admin/configuration/variables/change' variable_id='_ID_'}" />
<input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables/change' variable_id='_ID_'}" />
{/form_field}
{* We do not allow users to create hidden or secured variables from here *}
{form_field form=$form field='hidden'}
<input type="hidden" name="{$name}" value="0" />
{/form_field}
{form_field form=$form field='secured'}
<input type="hidden" name="{$name}" value="0" />
{/form_field}
<div class="modal-body">
@@ -167,8 +177,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
<button type="submit" class="btn btn-primary">{intl l="Create this variable"}</button>
<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
</div>
</form>
@@ -176,17 +186,38 @@
</div>
{* Delete confirmation dialog *}
<div class="modal hide fade" id="delete_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{intl l="Delete a variable"}</h3>
</div>
<div class="modal-body">
<p>{intl l="Do you really want to delete this variable ?"}</p>
</div>
<form method="post" action="{url path='/admin/configuration/variables/delete'}">
<input type="hidden" name="variable_id" id="variable_delete_id" value="" />
<div class="modal-footer">
<button type="submit" class="btn btn-primary">{intl l="Yes"}</button>
<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">{intl l="No"}</button>
</div>
</form>
</div>
{include file='includes/js.inc.html'}
<script>
$(function() {
// Variable delete confirmation
// Set proper variable ID in delete from
$('a.config-delete').click(function(ev) {
if (! confirm("{intl l='Do you really want to delete this variable ?'}")) {
ev.preventDefault();
}
});
$('#variable_delete_id').val($(this).data('id'));
});
{* display the form creation dialog if it contains errors *}