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

fix merge error

Browse Source
This commit is contained in:
Uwe Steinmann 2021-03-12 10:13:57 +01:00
parent c39fbcb70d
commit 05e1f04773
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,9 +502,6 @@ function typeahead() { /* {{{ */
?> ?>
<tr> <tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td> <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<<<<<<< HEAD
<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null, 'attributes', true) ?></td>
=======
<td> <td>
<?php <?php
if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date)
@ -512,7 +509,6 @@ function typeahead() { /* {{{ */
else else
$this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true) $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true)
?></td> ?></td>
>>>>>>> seeddms-5.1.x
</tr> </tr>
<?php <?php