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

This commit is contained in:
Uwe Steinmann 2023-02-22 09:18:04 +01:00
commit 1463f00faf
2 changed files with 2 additions and 1 deletions

View File

@ -253,6 +253,7 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- conversion from pdf to png replaces alpha channel with white - conversion from pdf to png replaces alpha channel with white
- add list of conversion services in debug menu of admin tool - add list of conversion services in debug menu of admin tool
- use chosen select for custom attributes
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.29 Changes in version 5.1.29

View File

@ -2033,7 +2033,7 @@ $(document).ready(function() {
default: default:
if($valueset = $attrdef->getValueSetAsArray()) { if($valueset = $attrdef->getValueSetAsArray()) {
$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>"; $content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
$content .= "<select class=\"form-control\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]"; $content .= "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
if($attrdef->getMultipleValues() || $alwaysmultiple) { if($attrdef->getMultipleValues() || $alwaysmultiple) {
$content .= "[]\" multiple"; $content .= "[]\" multiple";
} else { } else {