printAttributeEditField() takes a second parameter the attribute

this was the attribute value
This commit is contained in:
Uwe Steinmann 2015-04-15 14:11:52 +02:00
parent 444d3a8b01
commit 7d7a21fc9e

View File

@ -1018,7 +1018,7 @@ function folderSelected<?php echo $form ?>(id, name) {
<?php <?php
} /* }}} */ } /* }}} */
function printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */ function printAttributeEditField($attrdef, $attribute, $fieldname='attributes') { /* {{{ */
if($valueset = $attrdef->getValueSetAsArray()) { if($valueset = $attrdef->getValueSetAsArray()) {
echo "<select name=\"".$fieldname."[".$attrdef->getId()."]"; echo "<select name=\"".$fieldname."[".$attrdef->getId()."]";
if($attrdef->getMultipleValues()) { if($attrdef->getMultipleValues()) {
@ -1030,6 +1030,7 @@ function folderSelected<?php echo $form ?>(id, name) {
if(!$attrdef->getMultipleValues()) { if(!$attrdef->getMultipleValues()) {
echo "<option value=\"\"></option>"; echo "<option value=\"\"></option>";
} }
$objvalue = $attribute ? $attribute->getValueAsArray() : array();
foreach($valueset as $value) { foreach($valueset as $value) {
if($value) { if($value) {
echo "<option value=\"".htmlspecialchars($value)."\""; echo "<option value=\"".htmlspecialchars($value)."\"";
@ -1042,7 +1043,7 @@ function folderSelected<?php echo $form ?>(id, name) {
} }
echo "</select>"; echo "</select>";
} else { } else {
echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\" />"; echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".($attribute ? htmlspecialchars($attribute->getValue()) : '')."\" />";
} }
} /* }}} */ } /* }}} */