Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(legacy): ensure validation is performed on the track type form (#2985) 

### Description

Fixes #2939

The zend form validation was not performed, only a custom method to
validate the code was used. This merge both validation, and leverage the
Zend form validation framework.

Also allow updating the track type code from the track type form.
Related to #2955
This commit is contained in:
Jonas L 2024-04-13 15:54:47 +02:00 committed by GitHub
parent f1c7dd89f1
commit 5ad69bf0b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/application/controllers/TracktypeController.php
View File

@ -44,11 +44,9 @@ class TracktypeController extends Zend_Controller_Action
$formData[$v[0]] = urldecode($v[1]);
}
if ($form->validateCode($formData)) {
if ($form->isValid($formData)) {
$tracktype = new Application_Model_Tracktype($formData['tracktype_id']);
if (empty($formData['tracktype_id'])) {
$tracktype->setCode($formData['code']);
}
$tracktype->setCode($formData['code']);
$tracktype->setTypeName($formData['type_name']);
$tracktype->setDescription($formData['description']);
$tracktype->setVisibility($formData['visibility']);

26
legacy/application/forms/AddTracktype.php
View File

@ -28,6 +28,17 @@ class Application_Form_AddTracktype extends Zend_Form
$code->setAttrib('style', 'width: 40%');
$code->setRequired(true);
$code->addValidator($notEmptyValidator);
$uniqueTrackTypeCodeValidator = new Zend_Validate_Callback(function ($value, $context) {
if (strlen($context['tracktype_id']) === 0) { // Only check uniqueness on create
return CcTracktypesQuery::create()->filterByDbCode($value)->count() === 0;
}
return true;
});
$uniqueTrackTypeCodeValidator->setMessage(_('Code is not unique.'));
$code->addValidator($uniqueTrackTypeCodeValidator);
$code->addFilter('StringTrim');
$this->addElement($code);
@ -64,19 +75,4 @@ class Application_Form_AddTracktype extends Zend_Form
$saveBtn->setLabel(_('Save'));
$this->addElement($saveBtn);
}
public function validateCode($data)
{
if (strlen($data['tracktype_id']) == 0) {
$count = CcTracktypesQuery::create()->filterByDbCode($data['code'])->count();
if ($count != 0) {
$this->getElement('code')->setErrors([_('Code is not unique.')]);
return false;
}
}
return true;
}
}