gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix validation of attributes

Browse Source
This commit is contained in:
Uwe Steinmann 2019-12-13 17:39:05 +01:00
parent a0661536b3
commit 058fc1217e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controllers/class.AddDocument.php
View File

@ -58,9 +58,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
$attributes = $this->getParam('attributes'); $attributes = $this->getParam('attributes');
foreach($attributes as $attrdefid=>$attribute) { foreach($attributes as $attrdefid=>$attribute) {
if($attrdef = $dms->getAttributeDefinition($attrdefid)) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
return false;
}
if($attribute) { if($attribute) {
if(!$attrdef->validate($attribute)) { if(!$attrdef->validate($attribute)) {
$this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute);
@ -70,20 +68,26 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
$this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName()));
return false; return false;
} }
} else {
if($ret === false)
return false;
}
} }
} }
$attributes_version = $this->getParam('attributesversion'); $attributes_version = $this->getParam('attributesversion');
foreach($attributes_version as $attrdefid=>$attribute) { foreach($attributes_version as $attrdefid=>$attribute) {
if($attrdef = $dms->getAttributeDefinition($attrdefid)) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
return false;
}
if($attribute) { if($attribute) {
if(!$attrdef->validate($attribute)) { if(!$attrdef->validate($attribute)) {
$this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute);
return false; return false;
} }
} }
} else {
if($ret === false)
return false;
}
} }
} }
$workflow = $this->getParam('workflow'); $workflow = $this->getParam('workflow');

8
controllers/class.AddSubFolder.php
View File

@ -42,9 +42,7 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
$attributes = $this->getParam('attributes'); $attributes = $this->getParam('attributes');
foreach($attributes as $attrdefid=>$attribute) { foreach($attributes as $attrdefid=>$attribute) {
if($attrdef = $dms->getAttributeDefinition($attrdefid)) { if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
if(false === $this->callHook('validateAttribute', $attrdef, $attribute)) { if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
return false;
}
if($attribute) { if($attribute) {
if(!$attrdef->validate($attribute)) { if(!$attrdef->validate($attribute)) {
$this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute); $this->errormsg = getAttributeValidationError($attrdef->getValidationError(), $attrdef->getName(), $attribute);
@ -54,6 +52,10 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
$this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName())); $this->errormsg = array("attr_min_values", array("attrname"=>$attrdef->getName()));
return false; return false;
} }
} else {
if($ret === false)
return false;
}
} }
} }
$notificationgroups = $this->getParam('notificationgroups'); $notificationgroups = $this->getParam('notificationgroups');