VladPolskiy/dokuwiki-plugin-struct
1
0
Fork 0
mirror of https://github.com/cosmocode/dokuwiki-plugin-struct.git synced 2025-07-29 11:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix placeholder application for bureaucracy fields

Browse Source 
We were applying replacements in setVal() but that is weirdly called
during parsing and then gets cached. But it's also called again when the
validation fails... It's all a mess.

This tries to work around the issue, but I am far from sure this hits
all the (edge) cases.

Really without a refactoring of bureaucracy it's nearly impossible
to interface cleanly with it.
This commit is contained in:
Andreas Gohr
2025-07-24 12:00:58 +02:00
parent 62ab667ddb
commit 1dcc3dbe1e
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
helper/field.php
View File

@ -47,15 +47,25 @@ class helper_plugin_struct_field extends helper_plugin_bureaucracy_field
*/
protected function setVal($value)
{
global $INPUT;
if (!$this->column) {
$value = '';
} else {
$value = $this->replace($value);
$validator = new ValueValidator();
$this->error = !$validator->validateValue($this->column, $value);
if ($this->error) {
foreach ($validator->getErrors() as $error) {
msg(hsc($error), -1);
// This method is called at parsing time, and again on action submit
// we really only want to validate the value on action submit
//
// At parsing time, the value might still be a placeholder. Ideally
// bureaucracy would already handle this. But well...
if($INPUT->post->has('bureaucracy')) {
$validator = new ValueValidator();
$this->error = !$validator->validateValue($this->column, $value);
if ($this->error) {
foreach ($validator->getErrors() as $error) {
msg(hsc($error), -1);
}
}
}
}
@ -154,22 +164,23 @@ class helper_plugin_struct_field extends helper_plugin_bureaucracy_field
* Returns a Value object for the current column.
* Special handling for Page and Lookup literal form values.
*
* Used for rendering the field only.
*
* @return Value
*/
protected function createValue()
{
/*
// The value in bureaucracy is always a string, if unset init it.
$preparedValue = $this->opt['value'] ?? '';
if($this->column->isMulti()) {
// multi-value fields are treated as comma-separated lists
$preparedValue = explode(',', $preparedValue);
$preparedValue = array_map('trim', $preparedValue);
$preparedValue = array_filter($preparedValue);
}
*/
// input value or appropriately initialized empty value
$preparedValue = $this->opt['value'] ?? ($this->column->isMulti() ? [] : '');
// apply placeholder replacements
$preparedValue = $this->replace($preparedValue);
// Validating here is actually not a validation, that will happen again in setVal() when
// the form is submitted. instead, here we're using it's data cleanup functionality on the value.
$validator = new ValueValidator();
$validator->validateValue($this->column, $preparedValue);
/** @var string|array $preparedValue is now an array or a string */
// page fields might need to be JSON encoded depending on usetitles config
if (