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

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-03-06 16:27:48 +01:00
commit 347c740f1f
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/Core/inc.ClassAttribute.php
View File

@ -177,12 +177,14 @@ class SeedDMS_Core_Attribute { /* {{{ */
if($values) { if($values) {
$vsep = $this->getValueSetSeparator(); $vsep = $this->getValueSetSeparator();
if($valueset) { if($valueset) {
/* Validation should have been done before
$error = false; $error = false;
foreach($values as $v) { foreach($values as $v) {
if(!in_array($v, $valueset)) { $error = true; break; } if(!in_array($v, $valueset)) { $error = true; break; }
} }
if($error) if($error)
return false; return false;
*/
$valuesetstr = $this->_attrdef->getValueSet(); $valuesetstr = $this->_attrdef->getValueSet();
$value = $vsep.implode($vsep, $values); $value = $vsep.implode($vsep, $values);
} else { } else {
@ -203,12 +205,14 @@ class SeedDMS_Core_Attribute { /* {{{ */
} }
if($valueset) { if($valueset) {
/* Validation should have been done before
$error = false; $error = false;
foreach($values as $v) { foreach($values as $v) {
if(!in_array($v, $valueset)) { $error = true; break; } if(!in_array($v, $valueset)) { $error = true; break; }
} }
if($error) if($error)
return false; return false;
*/
$value = $valuesetstr[0].implode($valuesetstr[0], $values); $value = $valuesetstr[0].implode($valuesetstr[0], $values);
} else { } else {
$value = ','.implode(',', $values); $value = ','.implode(',', $values);

2
SeedDMS_Core/Core/inc.ClassObject.php
View File

@ -244,6 +244,7 @@ class SeedDMS_Core_Object { /* {{{ */
$sep = substr($attrdef->getValueSet(), 0, 1); $sep = substr($attrdef->getValueSet(), 0, 1);
$value = $sep.implode($sep, $value); $value = $sep.implode($sep, $value);
} }
/* Handle the case if an attribute is not set already */
if(!isset($this->_attributes[$attrdef->getId()])) { if(!isset($this->_attributes[$attrdef->getId()])) {
switch(get_class($this)) { switch(get_class($this)) {
case $this->_dms->getClassname('document'): case $this->_dms->getClassname('document'):
@ -271,6 +272,7 @@ class SeedDMS_Core_Object { /* {{{ */
return true; return true;
} }
/* The attribute already exists. setValue() will either update or delete it. */
$this->_attributes[$attrdef->getId()]->setValue($value); $this->_attributes[$attrdef->getId()]->setValue($value);
return true; return true;

1
SeedDMS_Core/package.xml
View File

@ -1883,6 +1883,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
- add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS() - add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS()
- add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents - add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents
- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList() - add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
- do not validate value in SeedDMS_Core_Attribute::setValue(), it should have been done before
</notes> </notes>
</release> </release>
<release> <release>

4
views/bootstrap/class.UpdateDocument.php
View File

@ -295,11 +295,11 @@ console.log(element);
} elseif(is_string($arr)) { } elseif(is_string($arr)) {
echo $arr; echo $arr;
} else { } else {
$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef))); $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef), 'attributes_version'));
} }
} }
} }
$arrs = $this->callHook('addDocumentContentAttributes', $folder); $arrs = $this->callHook('addDocumentContentAttributes', $document);
if(is_array($arrs)) { if(is_array($arrs)) {
foreach($arrs as $arr) { foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]); $this->formField($arr[0], $arr[1]);